[#1251] Bug fix: resource_view_list returns [] if

no views, not NotFound
ckan · Nov 4, 2013 · 29a7759 · 29a7759
1 parent a9d2c1e
commit 29a7759
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
@@ -381,12 +381,9 @@ def read(self, id, format='html'):
 
         # can the resources be previewed?
         for resource in c.pkg_dict['resources']:
-            try:
-                get_action('resource_view_list')(
-                    context, {'id': resource['id']})
-                resource['has_views'] = True
-            except NotFound:
-                resource['has_views'] = False
+            resource_views = get_action('resource_view_list')(
+                context, {'id': resource['id']})
+            resource['has_views'] = len(resource_views) > 0
 
         self._setup_template_variables(context, {'id': id},
                                        package_type=package_type)
@@ -1198,14 +1195,10 @@ def resource_read(self, id, resource_id):
 
         c.related_count = c.pkg.related_count
 
-        vars = {}
-        try:
-            vars['resource_views'] = get_action('resource_view_list')(
-                context, {'id': resource_id})
-            c.resource['has_views'] = True
-        except NotFound:
-            vars['resource_views'] = []
-            c.resource['has_views'] = False
+        resource_views = get_action('resource_view_list')(
+            context, {'id': resource_id})
+        vars = {'resource_views': resource_views}
+        c.resource['has_views'] = len(resource_views) > 0
 
         return render('package/resource_read.html', extra_vars=vars)