Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
522af8f6
Unverified
Commit
522af8f6
authored
9 months ago
by
Fredrik Jonsson
Committed by
GitHub
9 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove filters from tables on dashboards. (#3949)
Fixes #3911
parent
faf66cbf
No related branches found
No related tags found
1 merge request
!89
Upgrade to 5.10.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hypha/apply/dashboard/templates/dashboard/dashboard.html
+3
-6
3 additions, 6 deletions
hypha/apply/dashboard/templates/dashboard/dashboard.html
hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+3
-6
3 additions, 6 deletions
...ply/dashboard/templates/dashboard/reviewer_dashboard.html
with
6 additions
and
12 deletions
hypha/apply/dashboard/templates/dashboard/dashboard.html
+
3
−
6
View file @
522af8f6
...
@@ -91,14 +91,11 @@
...
@@ -91,14 +91,11 @@
{% if PROJECTS_ENABLED and projects.table.data %}
{% if PROJECTS_ENABLED and projects.table.data %}
<div
id=
"active-projects"
class=
"wrapper wrapper--bottom-space"
>
<div
id=
"active-projects"
class=
"wrapper wrapper--bottom-space"
>
{% trans "Your projects" as project_heading %}
{% trans "Your projects" as project_heading %}
{% include "funds/includes/table_filter_and_search.html" with filter=projects.filterset filter_action=projects.url search_term=search_term search_action=projects.url search_placeholder="projects" use_search=True use_batch_actions=False heading="Your projects" %}
{% render_table projects.table %}
{% render_table projects.table %}
{% if projects.display_more %}
<div
class=
"all-submissions-table__more"
>
<div
class=
"all-submissions-table__more"
>
<a
href=
"{{ projects.url }}?lead={{ request.user.pk }}"
>
{% trans "Show all" %}
</a>
<a
href=
"{{ projects.url }}?lead={{ request.user.pk }}"
>
{% trans "Show all" %}
</a>
</div>
</div>
{% endif %}
</div>
</div>
{% endif %}
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+
3
−
6
View file @
522af8f6
...
@@ -30,14 +30,11 @@
...
@@ -30,14 +30,11 @@
<div
class=
"wrapper wrapper--bottom-space"
>
<div
class=
"wrapper wrapper--bottom-space"
>
{% trans "Your previous reviews" as review_heading %}
{% trans "Your previous reviews" as review_heading %}
{% include "funds/includes/table_filter_and_search.html" with filter=my_reviewed.filterset filter_action=my_reviewed.url search_term=search_term search_action=my_reviewed.url use_search=True use_batch_actions=False heading=review_heading %}
{% render_table my_reviewed.table %}
{% render_table my_reviewed.table %}
{% if my_reviewed.display_more %}
<div
class=
"all-submissions-table__more"
>
<div
class=
"all-submissions-table__more"
>
<a
href=
"{{ my_reviewed.url }}?reviewers={{ request.user.pk }}"
>
{% trans "Show all" %}
</a>
<a
href=
"{{ my_reviewed.url }}?reviewers={{ request.user.pk }}"
>
{% trans "Show all" %}
</a>
</div>
</div>
{% endif %}
</div>
</div>
{% endif %}
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment