diff --git a/funders/templates/funders/funders.html b/funders/templates/funders/funders.html index cd9dfd6d4c2f7afc44d157a94a4471d7113720b0..1c6af178de2a883fbc15f36607d03268df0eb6d4 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 ec3521ede5af0392724a07aca2ab22f95403c0c7..abc0e82874c1f25ec1de7352335f25d13e1d9166 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 50f46f967e463036e4f4d78e4a3a641643ed182c..dbcb1cc49945bb296af144881b190848d42b4438 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)