From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 25 Oct 2012 14:46:14 +0000
Subject: Changing the content disposition, just in case
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=ba298984a30670c5cdf1c532059c9137d04d47e0
---
Changing the content disposition, just in case
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -34,7 +34,7 @@
             filter(GA_Stat.period_name==month).\
             order_by('GA_Stat.stat_name, GA_Stat.key').all()
 
-        response.headers['Content-disposition'] = 'attachment; filename=dgu_analytics_%s.csv' % (month)
+        #response.headers['Content-disposition'] = 'attachment; filename=dgu_analytics_%s.csv' % (month,)
         response.headers['Content-Type'] = "text/csv; charset=utf-8"
 
         writer = csv.writer(response)
@@ -58,7 +58,8 @@
 
         entries = model.Session.query(GA_Stat).\
             filter(GA_Stat.stat_name=='Totals').\
-            filter(GA_Stat.period_name==c.month).all()
+            filter(GA_Stat.period_name==c.month).\
+            order_by('ga_stat.key').all()
         c.global_totals = [(s.key, s.value) for s in entries ]
 
         keys = {
@@ -87,6 +88,7 @@
     """
 
     def index(self):
+
         # Get the month details by fetching distinct values and determining the
         # month names from the values.
         c.months = _month_details(GA_Url)

--- a/ckanext/ga_report/plugin.py
+++ b/ckanext/ga_report/plugin.py
@@ -18,16 +18,6 @@
 
     def after_map(self, map):
         map.connect(
-            '/data/analytics',
-            controller='ckanext.ga_report.controller:GaReport',
-            action='index'
-        )
-        map.connect(
-            '/data/analytics_{month}.csv',
-            controller='ckanext.ga_report.controller:GaReport',
-            action='csv'
-        )
-        map.connect(
             '/data/analytics/publisher/',
             controller='ckanext.ga_report.controller:GaPublisherReport',
             action='index'
@@ -37,6 +27,16 @@
             controller='ckanext.ga_report.controller:GaPublisherReport',
             action='read'
         )
+        map.connect(
+            '/data/analytics',
+            controller='ckanext.ga_report.controller:GaReport',
+            action='index'
+        )
+        map.connect(
+            '/data/analytics/data_{month}.csv',
+            controller='ckanext.ga_report.controller:GaReport',
+            action='csv'
+        )
         return map
 
 

--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -15,9 +15,8 @@
           As well as showing the number of views within ${c.month_desc}, it will also show the
           number of visitors that viewed each dataset.
       </p>
-      <p>
        <p>The dataset list page for <a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='read', id=c.publisher.name)}">${c.publisher.title}</a> was viewed ${c.publisher_page_views} times during ${c.month_desc}</p>
-      </p>
+       <p>View the <a href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport', action='index')}">publishers</a> leaderboard</p>
     </li>
   </py:match>