[601] Make sure only active datasets are shown in popular datasets on publisher homepage
--- a/ckanext/ga_report/helpers.py
+++ b/ckanext/ga_report/helpers.py
@@ -107,12 +107,18 @@
for entry in entries:
if len(datasets) < count:
p = model.Package.get(entry.url[len('/dataset/'):])
+
if not p:
_log.warning("Could not find Package for {url}".format(url=entry.url))
continue
+ if not p.state == 'active':
+ _log.warning("Package {0} is not active, it is {1}".format(p.name, p.state))
+ continue
+
if not p in datasets:
datasets[p] = {'views':0, 'visits': 0}
+
datasets[p]['views'] = datasets[p]['views'] + int(entry.pageviews)
datasets[p]['visits'] = datasets[p]['visits'] + int(entry.visits)
--- a/ckanext/ga_report/templates/ga_report/publisher/index.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/index.html
@@ -22,10 +22,10 @@
<script type="text/javascript" src="/scripts/vendor/d3.layout.min.js"></script>
<script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script>
</py:def>
+ <py:def function="page_heading">Site Usage ${usage_nav('Publishers')}</py:def>
<div py:match="content">
- <h1>Site Usage ${usage_nav('Publishers')}</h1>
<div class="boxed">
--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -21,10 +21,9 @@
<py:match path="primarysidebar">
${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='dataset_csv',id=c.publisher_name or 'all',month=c.month or 'all'))}
</py:match>
-
+ <py:def function="page_heading">Site Usage ${usage_nav('Datasets')}</py:def>
<div py:match="content">
- <h1>Site Usage ${usage_nav('Datasets')}</h1>
<div class="boxed">
<h3 py:if="c.publisher"><a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController',action='read',id=c.publisher.name)}">${c.publisher.title}</a></h3>
--- a/ckanext/ga_report/templates/ga_report/site/downloads.html
+++ b/ckanext/ga_report/templates/ga_report/site/downloads.html
@@ -11,8 +11,8 @@
${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv_downloads',month=c.month or 'all'))}
</py:match>
+ <py:def function="page_heading">Downloads ${usage_nav('Downloads')}</py:def>
<div py:match="content">
- <h1>Downloads ${usage_nav('Downloads')}</h1>
<div class="boxed">
--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -22,8 +22,9 @@
${ga_sidebar(download_link=h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all'))}
</py:match>
+ <py:def function="page_heading">Site Usage ${usage_nav('Site-wide')}</py:def>
+
<div py:match="content">
- <h1>Site Usage ${usage_nav('Site-wide')}</h1>
<div class="boxed">
<div class="tabbable">