From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 25 Oct 2012 19:44:06 +0000
Subject: Make sure we 404 for non-existent groups
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=95d2e64026a5af27892686aa73946b530e61529a
---
Make sure we 404 for non-existent groups
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -1,6 +1,6 @@
 import logging
 import operator
-from ckan.lib.base import BaseController, c, render, request, response
+from ckan.lib.base import BaseController, c, render, request, response, abort
 
 import sqlalchemy
 from sqlalchemy import func, cast, Integer
@@ -65,6 +65,10 @@
             val = e.value
             if e.key in ['Average time on site', 'Pages per visit', 'Percent new visits']:
                 val =  "%.2f" % round(float(e.value), 2)
+                if e.key == 'Average time on site':
+                    mins, secs = divmod(float(val), 60)
+                    hours, mins = divmod(mins, 60)
+                    val = '%02d:%02d:%02d (%s seconds) ' % (hours, mins, secs, val)
                 e.key = '%s *' % e.key
             c.global_totals.append((e.key, val))
 
@@ -125,7 +129,10 @@
 
 
     def read(self, id):
+
         c.publisher = model.Group.get(id)
+        if not c.publisher:
+            abort(404, '404 Not Found')
         c.top_packages = [] # package, dataset_views in c.top_packages
 
         # Get the month details by fetching distinct values and determining the