Merge branch '2557-package-count-issue'

ckan · Aug 11, 2015 · c3a4322 · c3a4322
2 parents 63e3bc9 + 13b8bef
commit c3a4322
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -1921,7 +1921,8 @@ def get_group(id):
         context = {'ignore_auth': True,
                    'limits': {'packages': 2},
                    'for_view': True}
-        data_dict = {'id': id}
+        data_dict = {'id': id,
+                     'include_datasets': True}
 
         try:
             out = logic.get_action(get_action)(context, data_dict)

diff --git a/ckan/templates/group/snippets/info.html b/ckan/templates/group/snippets/info.html
@@ -34,7 +34,7 @@ <h1 class="heading">
         </dl>
         <dl>
           <dt>{{ _('Datasets') }}</dt>
-          <dd>{{ h.SI_number_span(group.packages|length) }}</dd>
+          <dd>{{ h.SI_number_span(group.package_count) }}</dd>
         </dl>
       </div>
       {% endblock %}

diff --git a/ckan/templates/organization/snippets/organization_item.html b/ckan/templates/organization/snippets/organization_item.html
@@ -27,8 +27,8 @@ <h3 class="media-heading">{{ organization.display_name }}</h3>
     {% endif %}
   {% endblock %}
   {% block datasets %}
-    {% if organization.packages %}
-      <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', organization.packages).format(num=organization.packages) }}</strong>
+    {% if organization.package_count %}
+      <strong class="count">{{ ungettext('{num} Dataset', '{num} Datasets', organization.package_count).format(num=organization.package_count) }}</strong>
     {% else %}
       <span class="count">{{ _('0 Datasets') }}</span>
     {% endif %}