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

Combine the reports/reporting nav items #4240

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Combine the reports/reporting nav items #4240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion hypha/apply/projects/templates/application_projects/report_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 4 additions & 1 deletion hypha/apply/projects/templates/application_projects/reporting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions hypha/apply/projects/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -256,5 +257,4 @@
)
),
),
path("reporting/", ReportingView.as_view(), name="reporting"),
]
7 changes: 1 addition & 6 deletions hypha/core/navigation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
],
Expand Down
Loading