From bc663cb8821f9b28137c8178a77f769c1d609b2f Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Sun, 14 Sep 2014 14:39:26 -0400
Subject: [PATCH] Remove literal Folder column declaration and convert to model
 column registration

---
 mayan/apps/folders/__init__.py | 13 +++++++++++--
 mayan/apps/folders/views.py    | 10 +---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py
index 1cf345aedb..09dabe64be 100644
--- a/mayan/apps/folders/__init__.py
+++ b/mayan/apps/folders/__init__.py
@@ -1,10 +1,14 @@
 from __future__ import absolute_import
 
+from django.utils.translation import ugettext as _
+
 from acls.api import class_permissions
 from acls.permissions import ACLS_EDIT_ACL, ACLS_VIEW_ACL
+from common.utils import encapsulate
 from documents.models import Document
-from navigation.api import (register_links, register_top_menu,
-    register_multi_item_links, register_sidebar_template)
+from navigation.api import (register_links, register_model_list_columns,
+                            register_multi_item_links,
+                            register_sidebar_template, register_top_menu)
 
 from .links import (folder_list, folder_create, folder_edit, folder_delete,
     folder_document_multiple_remove, folder_view, folder_add_document,
@@ -43,3 +47,8 @@ class_permissions(Document, [
     PERMISSION_FOLDER_ADD_DOCUMENT,
     PERMISSION_FOLDER_REMOVE_DOCUMENT,
 ])
+
+register_model_list_columns(Folder, [
+    {'name': _(u'Created'), 'attribute': 'datetime_created'},
+    {'name': _(u'Documents'), 'attribute': encapsulate(lambda x: x.documents.count())},
+])
diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py
index 76c0968ac4..b64ca819b8 100644
--- a/mayan/apps/folders/views.py
+++ b/mayan/apps/folders/views.py
@@ -36,12 +36,8 @@ class FolderListView(SingleObjectListView):
 
     def get_extra_context(self):
         return {
-            'title': _(u'folders'),
+            'title': _(u'Folders'),
             'multi_select_as_buttons': True,
-            'extra_columns': [
-                {'name': _(u'Created'), 'attribute': 'datetime_created'},
-                {'name': _(u'Documents'), 'attribute': encapsulate(lambda x: x.documents.count())}
-            ],
             'hide_link': True,
         }
 
@@ -224,10 +220,6 @@ def document_folder_list(request, document_id):
         'title': _(u'Folders containing: %s') % document,
         'object': document,
         'multi_select_as_buttons': True,
-        'extra_columns': [
-            {'name': _(u'Created'), 'attribute': 'datetime_created'},
-            {'name': _(u'Documents'), 'attribute': encapsulate(lambda x: x.documents.count())}
-        ],
         'hide_link': True,
         }