Changeset 56

Timestamp:

07/07/09 14:14:23 (3 years ago)

Author:

nazar

Message:

 

Location:

plesonet_admin/trunk

Files:

• admin_settings.py (modified) (1 diff)
• templatetags/plesonet_admin_tags.py (modified) (3 diffs)

plesonet_admin/trunk/admin_settings.py

@@ -82 +82 @@
                 ]
 
-ACTIONS = [ {'url': reverse('catalogue_import'),
-            'name':_('Import catalogue'),},
-            {'url': reverse('renovation_service_import'),
-            'name':_('Import calculator'),},
-            {'url': reverse('do_rss_import'),
-            'name':_('RSS Import'),},                        
-            {'url': reverse('do_send_subscription'),
-            'name':_('Send subscription'),},
-          ]
+ADMIN_ACTIONS = [ {'url': reverse('catalogue_import'),
+                   'name':_('Import catalogue'),},
+                  {'url': reverse('renovation_service_import'),
+                   'name':_('Import calculator'),},
+                  {'url': reverse('do_rss_import'),
+                   'name':_('RSS Import'),},                        
+                  {'url': reverse('do_send_subscription'),
+                   'name':_('Send subscription'),},
+                  ]
 
     

plesonet_admin/trunk/templatetags/plesonet_admin_tags.py

@@ -2 +2 @@
 from django import template
 from django.utils.translation import ugettext_lazy as _
-from plesonet_admin.admin_settings import *
 from django.conf import settings 
 
@@ -23 +22 @@
         #build new list
         groups = []
-        for g in ADMIN_GROUPS:
+        for g in settings.ADMIN_GROUPS:
             gmod = []
             for m in g['models']:
@@ -64 +63 @@
     def render(self, context):
         try:
-            context['custom_actions'] = ACTIONS
+            context['custom_actions'] = settings.ADMIN_ACTIONS
+            for ca in context['custom_actions']:
+                if callable(ca['url']):
+                    ca['url'] = ca['url']()
         except NameError:
             context['custom_actions'] = []