Minor change to sidebar
--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -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 = {
--- a/ckanext/ga_report/plugin.py
+++ b/ckanext/ga_report/plugin.py
@@ -18,6 +18,16 @@
def after_map(self, map):
map.connect(
+ '/data/analytics/publisher/',
+ controller='ckanext.ga_report.controller:GaPublisherReport',
+ action='index'
+ )
+ map.connect(
+ '/data/analytics/publisher/{id}',
+ controller='ckanext.ga_report.controller:GaPublisherReport',
+ action='read'
+ )
+ map.connect(
'/data/analytics',
controller='ckanext.ga_report.controller:GaReport',
action='index'
@@ -27,16 +37,6 @@
controller='ckanext.ga_report.controller:GaReport',
action='csv'
)
- map.connect(
- '/data/analytics/publisher/',
- controller='ckanext.ga_report.controller:GaPublisherReport',
- action='index'
- )
- map.connect(
- '/data/analytics/publisher/{id}',
- controller='ckanext.ga_report.controller:GaPublisherReport',
- action='read'
- )
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>Go back to <a href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport', action='index')}">publishers</a></p>
</li>
</py:match>