From efa492ac90e5b4babab03a04ac2485e8b9254aba Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Mon, 4 Jan 2021 16:58:45 +0100 Subject: [PATCH] Check permissions in dashboard widgets list and unify trans tags --- .../core/templates/core/dashboard_widget/list.html | 13 ++++++++----- aleksis/core/templates/core/edit_dashboard.html | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/aleksis/core/templates/core/dashboard_widget/list.html b/aleksis/core/templates/core/dashboard_widget/list.html index 022101b9e..e4a8464e9 100644 --- a/aleksis/core/templates/core/dashboard_widget/list.html +++ b/aleksis/core/templates/core/dashboard_widget/list.html @@ -2,7 +2,7 @@ {% extends "core/base.html" %} -{% load i18n data_helpers %} +{% load i18n data_helpers rules %} {% load render_table from django_tables2 %} {% block browser_title %}{% blocktrans %}Dashboard widgets{% endblocktrans %}{% endblock %} @@ -17,11 +17,14 @@ {% blocktrans with name=widget_name %}Create {{ name }}{% endblocktrans %} </a> {% endfor %} - <a class="btn orange waves-effect waves-light" href="{% url "edit_default_dashboard" %}"> - <i class="material-icons left">edit</i> - {% trans "Edit default dashboard" %} - </a> + {% has_perm "core.edit_default_dashboard" user as can_edit_default_dashboard %} + {% if can_edit_default_dashboard %} + <a class="btn orange waves-effect waves-light" href="{% url "edit_default_dashboard" %}"> + <i class="material-icons left">edit</i> + {% trans "Edit default dashboard" %} + </a> + {% endif %} {% render_table table %} {% endblock %} diff --git a/aleksis/core/templates/core/edit_dashboard.html b/aleksis/core/templates/core/edit_dashboard.html index 2e8c633a3..09d9afd97 100644 --- a/aleksis/core/templates/core/edit_dashboard.html +++ b/aleksis/core/templates/core/edit_dashboard.html @@ -3,14 +3,14 @@ {% block browser_title %} {% if not default_dashboard %} - {% blocktrans %}Edit dashboard{% endblocktrans %} + {% trans "Edit dashboard" %} {% else %} {% trans "Edit default dashboard" %} {% endif %} {% endblock %} {% block page_title %} {% if not default_dashboard %} - {% blocktrans %}Edit dashboard{% endblocktrans %} + {% trans "Edit dashboard" %} {% else %} {% trans "Edit default dashboard" %} {% endif %} -- GitLab