[#890] New get_action helper and remove package_show extra work

ckan/lib/helpers.py

@@ -611,6 +611,13 @@ def check_access(action, data_dict=None):
     return authorized
 
 
+def get_action(action_name, data_dict=None):
+    '''Calls an action function from a template.'''
+    if data_dict is None:
+        data_dict = {}
+    return logic.get_action(action_name)({}, data_dict)
+
+
 def linked_user(user, maxlength=0, avatar=20):
     if user in [model.PSEUDO_USER__LOGGED_IN, model.PSEUDO_USER__VISITOR]:
         return user
@@ -1582,6 +1589,7 @@ def SI_number_span(number):
     'subnav_named_route',
     'default_group_type',
     'check_access',
+    'get_action',
     'linked_user',
     'group_name_to_title',
     'markdown_extract',

ckan/logic/action/get.py

@@ -754,12 +754,9 @@ def package_show(context, data_dict):
     for item in plugins.PluginImplementations(plugins.IPackageController):
         item.after_show(context, package_dict)
 
-    package_dict['num_followers'] = logic.get_action('dataset_follower_count')(
-        {'model': model, 'session': model.Session},
-        {'id': package_dict['id']})
-
     return package_dict
 
+
 def resource_show(context, data_dict):
     '''Return the metadata of a resource.
 

ckan/templates/package/read_base.html

@@ -56,7 +56,7 @@ <h1 class="heading">{{ pkg.title or pkg.name }}</h1>
         <div class="nums">
           <dl>
             <dt>{{ _('Followers') }}</dt>
-            <dd>{{ h.SI_number_span(pkg.num_followers) }}</dd>
+            <dd>{{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}</dd>
           </dl>
         </div>
         <div class="follow_button">