From baf52cf25dcf884f9407f0c9275a6fac5a6f6b8a Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 1 Nov 2017 18:03:40 +0100
Subject: [PATCH] Update modern url routes
---
funders/templates/funders/funders.html | 4 +++-
funders/urls.py | 15 ++++-----------
funders/views.py | 11 +++++++++++
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/funders/templates/funders/funders.html b/funders/templates/funders/funders.html
index cd9dfd6d4..1c6af178d 100644
--- a/funders/templates/funders/funders.html
+++ b/funders/templates/funders/funders.html
@@ -59,6 +59,7 @@
<th>Name</th>
<th>Acronym</th>
<th>Identifier</th>
+ <th></th>
</tr>
</thead>
<tbody id="accordion" role="tablist" aria-multiselectable="true">
@@ -67,10 +68,11 @@
<td>{{ funder.name }}</td>
<td>{{ funder.acronym }}</td>
<td>{{ funder.identifier }}</td>
+ <td><a href="">See all Publications for Funder</a></td>
</tr>
{% empty %}
<tr>
- <td colspan="3">No funders found</td>
+ <td colspan="4">No funders found</td>
</tr>
{% endfor %}
</tbody>
diff --git a/funders/urls.py b/funders/urls.py
index ec3521ede..abc0e8287 100644
--- a/funders/urls.py
+++ b/funders/urls.py
@@ -1,18 +1,11 @@
from django.conf.urls import url
-from django.views.generic import TemplateView
from . import views
urlpatterns = [
- url(r'^$', views.funders,
- name='funders'),
- url(r'^query_crossref_for_funder$',
- views.query_crossref_for_funder,
+ url(r'^$', views.funders, name='funders'),
+ url(r'^query_crossref_for_funder$', views.query_crossref_for_funder,
name='query_crossref_for_funder'),
- url(r'^add_funder$',
- views.add_funder,
- name='add_funder'),
- url(r'^add_grant$',
- views.add_grant,
- name='add_grant'),
+ url(r'^funders/add$', views.add_funder, name='add_funder'),
+ url(r'^grants/add$', views.add_grant, name='add_grant'),
]
diff --git a/funders/views.py b/funders/views.py
index 50f46f967..dbcb1cc49 100644
--- a/funders/views.py
+++ b/funders/views.py
@@ -63,3 +63,14 @@ def add_grant(request):
elif grant_form.has_changed():
messages.warning(request, 'The form was invalidly filled (grant already exists?).')
return redirect(reverse('funders:funders'))
+
+
+@permission_required('scipost.can_view_all_funding_info', raise_exception=True)
+def publication_per_funder(request):
+ funders = Funder.objects.all()
+ form = FunderRegistrySearchForm()
+ grants = Grant.objects.all()
+ grant_form = GrantForm()
+ context = {'form': form, 'funders': funders,
+ 'grants': grants, 'grant_form': grant_form}
+ return render(request, 'funders/funders.html', context)
--
GitLab