From: root <root@ip-172-31-18-206.ap-southeast-2.compute.internal>
Date: Fri, 20 Jun 2014 10:44:49 +0000
Subject: Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-ga-report
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=987914a6710fc950b838977695240f27fe40f988
---
Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-ga-report
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -342,7 +342,8 @@
                         downloads += int(x.value)
                 else:
                     downloads = 'No data'
-                top_packages.append((package, entry.pageviews, entry.visits, downloads))
+                if package.private == False:
+                    top_packages.append((package, entry.pageviews, entry.visits, downloads))
             else:
                 log.warning('Could not find package associated package')
 

--- a/ckanext/ga_report/helpers.py
+++ b/ckanext/ga_report/helpers.py
@@ -116,6 +116,10 @@
                 _log.warning("Package {0} is not active, it is {1}".format(p.name, p.state))
                 continue
 
+            if not p.private == False:
+                _log.warning("Package {0} is private {1}".format(p.name, p.state))
+                continue
+
             if not p in datasets:
                 datasets[p] = {'views':0, 'visits': 0}
 

--- a/ckanext/ga_report/plugin.py
+++ b/ckanext/ga_report/plugin.py
@@ -67,17 +67,17 @@
             action='publisher_csv'
         )
         map.connect(
-            '/site-usagesetsets_{id}_{month}.csv',
+            '/site-usage/dataset/datasets_{id}_{month}.csv',
             controller='ckanext.ga_report.controller:GaDatasetReport',
             action='dataset_csv'
         )
         map.connect(
-            '/site-usageset',
+            '/site-usage/dataset',
             controller='ckanext.ga_report.controller:GaDatasetReport',
             action='read'
         )
         map.connect(
-            '/site-usageset/{id}',
+            '/site-usage/dataset/{id}',
             controller='ckanext.ga_report.controller:GaDatasetReport',
             action='read_publisher'
         )

--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -85,7 +85,7 @@
              ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))}
            </td>
            <td class="td-numeric">${views}</td>
-           <td class="td-numeric">${downloads}</td>
+           <td class="td-numeric">${downloads}</td> 
         </tr>
       </py:for>
     </table>

--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -29,7 +29,7 @@
           <div class="panel-body">
             <ul>
               <li><a href="/site-usage/publisher">Publisher Usage Statistics</a></li>
-              <li><a href="/site-usageset">Dataset Usage Statistics</a></li>
+              <li><a href="/site-usage/dataset">Dataset Usage Statistics</a></li>
             </ul>
           </div>
         </div>

--- a/ckanext/ga_report/templates/ga_report/site/layout_base.html
+++ b/ckanext/ga_report/templates/ga_report/site/layout_base.html
@@ -114,7 +114,7 @@
           </span>
         </div>
         <a href="${h.url('home')}">
-          <img width="64" src="${h.url_for_static(g.site_logo)}" alt="${g.site_title} Logo" title="${g.site_title} Logo" id="logo" />
+          <img width="196" src="${h.url_for_static(g.site_logo)}" alt="${g.site_title} Logo" title="${g.site_title} Logo" id="logo" />
         </a>
         <div id="site-name">
 <!--          <a href="${h.url('home')}">${g.site_title} &mdash; ${g.site_description}</a>-->