diff --git a/hypha/apply/projects/templates/application_projects/report_list.html b/hypha/apply/projects/templates/application_projects/report_list.html index b01521a6ea..fb68d24a1b 100644 --- a/hypha/apply/projects/templates/application_projects/report_list.html +++ b/hypha/apply/projects/templates/application_projects/report_list.html @@ -9,7 +9,10 @@ {% adminbar %} {% slot header %}{% trans "Submitted Reports" %} ({{ table.rows|length }}){% endslot %} - {% slot sub_heading %}{% trans "View and filter all Submitted Reports" %}{% endslot %} + {% slot sub_heading %} + {% trans "View and filter all Submitted Reports" %} • + <a href="{% url 'apply:projects:reports:all' %}" class="text-blue-300 hover:underline">View all reports</a> + {% endslot %} {% endadminbar %} <div class="wrapper wrapper--large wrapper--inner-space-medium"> diff --git a/hypha/apply/projects/templates/application_projects/reporting.html b/hypha/apply/projects/templates/application_projects/reporting.html index 83c2d407bb..2c967e1153 100644 --- a/hypha/apply/projects/templates/application_projects/reporting.html +++ b/hypha/apply/projects/templates/application_projects/reporting.html @@ -9,7 +9,10 @@ {% adminbar %} {% slot header %}{% trans "Reporting" %} ({{ table.rows|length }}){% endslot %} - {% slot sub_heading %}{% trans "View, Search and filter reporting statuses" %}{% endslot %} + {% slot sub_heading %} + {% trans "View, Search and filter reporting statuses" %} • + <a href="{% url 'apply:projects:reports:submitted' %}" class="text-blue-300 hover:underline">View submitted reports</a> + {% endslot %} {% endadminbar %} <div class="wrapper wrapper--large wrapper--inner-space-medium"> diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py index 48c6ea0ce9..e84e5cee53 100644 --- a/hypha/apply/projects/urls.py +++ b/hypha/apply/projects/urls.py @@ -235,7 +235,8 @@ include( ( [ - path("", ReportListView.as_view(), name="all"), + path("", ReportListView.as_view(), name="submitted"), + path("all/", ReportingView.as_view(), name="all"), path( "<int:pk>/", include( @@ -256,5 +257,4 @@ ) ), ), - path("reporting/", ReportingView.as_view(), name="reporting"), ] diff --git a/hypha/core/navigation.py b/hypha/core/navigation.py index b7f8db5b83..2e5b0fc0b9 100644 --- a/hypha/core/navigation.py +++ b/hypha/core/navigation.py @@ -91,12 +91,7 @@ def get_primary_navigation_items(user): }, { "title": _("Reports"), - "url": reverse_lazy("apply:projects:reports:all"), - "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance", - }, - { - "title": _("Reporting"), - "url": reverse_lazy("apply:projects:reporting"), + "url": reverse_lazy("apply:projects:reports:submitted"), "permission_method": "hypha.apply.users.decorators.is_apply_staff_or_finance", }, ],