Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 404s #9

Open
wants to merge 4 commits into
base: dga-master
Choose a base branch
from
Open

Fix 404s #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25b33de
Update plugin.py
sukhrajghuman Feb 5, 2021
cd2ac42
Update index.html
sukhrajghuman Feb 5, 2021
2350322
Update read.html
sukhrajghuman Feb 5, 2021
54c25d1
Update index.html
sukhrajghuman Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ckanext/ga_report/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,49 +45,49 @@ def get_helpers(self):
def after_map(self, map):
# GaReport
map.connect(
'/site-usage',
'/data/site-usage',
controller='ckanext.ga_report.controller:GaReport',
action='index'
)
map.connect(
'/site-usage_{month}.csv',
'/data/site-usage_{month}.csv',
controller='ckanext.ga_report.controller:GaReport',
action='csv'
)
map.connect(
'/site-usage/downloads',
'/data/site-usage/downloads',
controller='ckanext.ga_report.controller:GaReport',
action='downloads'
)
map.connect(
'/site-usage/downloads_{month}.csv',
'/data/site-usage/downloads_{month}.csv',
controller='ckanext.ga_report.controller:GaReport',
action='csv_downloads'
)

# GaDatasetReport
map.connect(
'/site-usage/publisher',
'/data/site-usage/publisher',
controller='ckanext.ga_report.controller:GaDatasetReport',
action='publishers'
)
map.connect(
'/site-usage/publishers_{month}.csv',
'/data/site-usage/publishers_{month}.csv',
controller='ckanext.ga_report.controller:GaDatasetReport',
action='publisher_csv'
)
map.connect(
'/site-usage/dataset/datasets_{id}_{month}.csv',
'/data/site-usage/dataset/datasets_{id}_{month}.csv',
controller='ckanext.ga_report.controller:GaDatasetReport',
action='dataset_csv'
)
map.connect(
'/site-usage/dataset',
'/data/site-usage/dataset',
controller='ckanext.ga_report.controller:GaDatasetReport',
action='read'
)
map.connect(
'/site-usage/dataset/{id}',
'/data/site-usage/dataset/{id}',
controller='ckanext.ga_report.controller:GaDatasetReport',
action='read_publisher'
)
Expand Down
4 changes: 2 additions & 2 deletions ckanext/ga_report/templates/ga_report/publisher/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script>
{% endblock %}
{% block breadcrumbs %}
<li><a href="{{h.url_for_static('/site-usage')}}">Site Analytics</a></li>
<li><a href="{{h.url_for_static('/site-usage/publisher')}}">Publishers</a></li>
<li><a href="{{h.url_for_static('/data/site-usage')}}">Site Analytics</a></li>
<li><a href="{{h.url_for_static('/data/site-usage/publisher')}}">Publishers</a></li>
{% endblock %}
{% block content %}
{% set download_link=h.url_for(controller='ckanext.ga_report.controller:GaDatasetReport',action='publisher_csv',month=c.month or 'all') %}
Expand Down
4 changes: 2 additions & 2 deletions ckanext/ga_report/templates/ga_report/publisher/read.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<script type="text/javascript" src="/scripts/vendor/rickshaw.min.js"></script>
{% endblock %}
{% block breadcrumbs %}
<li><a href="{{h.url_for_static('/site-usage')}}">Site Analytics</a></li>
<li><a href="{{h.url_for_static('/data/site-usage')}}">Site Analytics</a></li>
{% if c.publisher %}
<li><a href="{{h.url_for_static('/site-publisher')}}">Publishers</a></li>
<li ><a href="{{h.url_for_static('/site-usage/publisher/' + c.publisher.name)}}">{{c.publisher.title}}</a></li>
<li ><a href="{{h.url_for_static('/data/site-usage/publisher/' + c.publisher.name)}}">{{c.publisher.title}}</a></li>
{% else %}
<li><a href="{{request.url}}">Usage By Dataset</a></li>
{% endif %}
Expand Down
8 changes: 4 additions & 4 deletions ckanext/ga_report/templates/ga_report/site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

{% block page_title %}Site usage{% endblock %}
{% block breadcrumbs %}
<li><a href="{{h.url_for_static('site-usage')}}">Site Analytics</a></li>
<li><a href="{{h.url_for_static('site-usage')}}">Site-wide</a></li>
<li><a href="{{h.url_for_static('data/site-usage')}}">Site Analytics</a></li>
<li><a href="{{h.url_for_static('data/site-usage')}}">Site-wide</a></li>
{% endblock %}
{% block content %}
<div class="row">
Expand All @@ -19,8 +19,8 @@ <h1>Site Usage</h1>
<div class="panel-heading"><strong>Jump To...</strong></div>
<div class="panel-body">
<ul>
<li><a href="{{h.url_for_static('/site-usage/publisher')}}">Publisher Usage Statistics</a></li>
<li><a href="{{h.url_for_static('/site-usage/dataset')}}">Dataset Usage Statistics</a></li>
<li><a href="{{h.url_for_static('/data/site-usage/publisher')}}">Publisher Usage Statistics</a></li>
<li><a href="{{h.url_for_static('/data/site-usage/dataset')}}">Dataset Usage Statistics</a></li>
</ul>
</div>
</div>
Expand Down