From be3707a4e2f1214500710780e49000d9d9c19ebd Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 6 May 2019 17:12:50 +0200 Subject: [PATCH 7/8] manager: use could_{action} instead of can_ in templates (#33515) --- .../templates/authentic2/manager/ou_detail.html | 4 ++-- .../manager/templates/authentic2/manager/ous.html | 2 +- .../templates/authentic2/manager/role_members.html | 14 +++++++------- .../authentic2/manager/role_members_table.html | 2 +- .../authentic2/manager/role_permissions.html | 4 ++-- .../authentic2/manager/role_permissions_table.html | 2 +- .../templates/authentic2/manager/roles.html | 2 +- .../authentic2/manager/service_roles_table.html | 2 +- .../templates/authentic2/manager/user_detail.html | 4 ++-- .../templates/authentic2/manager/user_roles.html | 2 +- .../authentic2/manager/user_roles_table.html | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/authentic2/manager/templates/authentic2/manager/ou_detail.html b/src/authentic2/manager/templates/authentic2/manager/ou_detail.html index 9f22ac9e..3a115283 100644 --- a/src/authentic2/manager/templates/authentic2/manager/ou_detail.html +++ b/src/authentic2/manager/templates/authentic2/manager/ou_detail.html @@ -17,13 +17,13 @@ {% block appbar %} {{ block.super }} - {% if view.can_delete %} + {% if view.could_delete %} {% trans "Delete" %} {% else %} {% trans "Delete" %} {% endif %} - {% if view.can_change %} + {% if view.could_change %} {% trans "Edit" %} {% else %} {% trans "Edit" %} diff --git a/src/authentic2/manager/templates/authentic2/manager/ous.html b/src/authentic2/manager/templates/authentic2/manager/ous.html index e6da200c..73013353 100644 --- a/src/authentic2/manager/templates/authentic2/manager/ous.html +++ b/src/authentic2/manager/templates/authentic2/manager/ous.html @@ -10,7 +10,7 @@ {% block appbar %} {{ block.super }} - {% if view.can_add %} + {% if view.could_add %} {% trans "Add organizational unit" %} {% endif %} diff --git a/src/authentic2/manager/templates/authentic2/manager/role_members.html b/src/authentic2/manager/templates/authentic2/manager/role_members.html index de5ca308..36f30741 100644 --- a/src/authentic2/manager/templates/authentic2/manager/role_members.html +++ b/src/authentic2/manager/templates/authentic2/manager/role_members.html @@ -19,15 +19,15 @@ {% block appbar %} {{ block.super }} - {% if not object.is_internal and view.can_delete %} + {% if not object.is_internal and view.could_delete %} {% trans "Delete" %} {% else %} {% trans "Delete" %} {% endif %} - {% if view.can_change and not object.is_internal %} + {% if view.could_change and not object.is_internal %} {% trans "Edit" %} {% else %} - {% if not view.can_change %} + {% if not view.could_change %} {% trans "Edit" %} {% else %} {% trans "Edit" %} @@ -52,7 +52,7 @@ {% include "authentic2/manager/export_include.html" with export_view_name="a2-manager-role-members-export" %} - {% if view.can_change %} + {% if view.could_change %}
{% csrf_token %} {{ form }} @@ -71,7 +71,7 @@ {% endif %} {% endfor %} - {% if view.can_change %} + {% if view.could_change %} {% else %} @@ -87,7 +87,7 @@ {% endif %} {% endfor %} - {% if view.can_change %} + {% if view.could_change %} {% else %} @@ -103,7 +103,7 @@ {% endif %} {% endfor %} - {% if view.can_change %} + {% if view.could_change %} {% else %} diff --git a/src/authentic2/manager/templates/authentic2/manager/role_members_table.html b/src/authentic2/manager/templates/authentic2/manager/role_members_table.html index cffdaa1e..8fc98c7d 100644 --- a/src/authentic2/manager/templates/authentic2/manager/role_members_table.html +++ b/src/authentic2/manager/templates/authentic2/manager/role_members_table.html @@ -7,6 +7,6 @@ {% endblock %} {% block table.tbody.last.column %} - {% if table.context.view.can_change and row.record.direct %}{% endif %} + {% if table.context.view.could_change and row.record.direct %}{% endif %} {% endblock %} {% endif %} diff --git a/src/authentic2/manager/templates/authentic2/manager/role_permissions.html b/src/authentic2/manager/templates/authentic2/manager/role_permissions.html index 95708862..d3562f6e 100644 --- a/src/authentic2/manager/templates/authentic2/manager/role_permissions.html +++ b/src/authentic2/manager/templates/authentic2/manager/role_permissions.html @@ -10,10 +10,10 @@ {% block appbar %} {{ block.super }} - {% if view.can_delete %} + {% if view.could_delete %} {% trans "Delete" %} {% endif %} - {% if view.can_change and not object.is_internal %} + {% if view.could_change and not object.is_internal %} {% trans "Edit" %} {% endif %} {% trans "Members" %} diff --git a/src/authentic2/manager/templates/authentic2/manager/role_permissions_table.html b/src/authentic2/manager/templates/authentic2/manager/role_permissions_table.html index 8675ed9e..88a42a3a 100644 --- a/src/authentic2/manager/templates/authentic2/manager/role_permissions_table.html +++ b/src/authentic2/manager/templates/authentic2/manager/role_permissions_table.html @@ -7,6 +7,6 @@ {% endblock %} {% block table.tbody.last.column %} - {% if table.context.view.can_change %}{% endif %} + {% if table.context.view.could_change %}{% endif %} {% endblock %} {% endif %} diff --git a/src/authentic2/manager/templates/authentic2/manager/roles.html b/src/authentic2/manager/templates/authentic2/manager/roles.html index 57f01e6f..c228a5a3 100644 --- a/src/authentic2/manager/templates/authentic2/manager/roles.html +++ b/src/authentic2/manager/templates/authentic2/manager/roles.html @@ -6,7 +6,7 @@ {% block appbar %} {{ block.super }} - {% if view.can_add %} + {% if view.could_add %} {% trans "Add role" %} {% else %} {% trans "Add role" %} diff --git a/src/authentic2/manager/templates/authentic2/manager/service_roles_table.html b/src/authentic2/manager/templates/authentic2/manager/service_roles_table.html index 6b440f58..b3d2f6f1 100644 --- a/src/authentic2/manager/templates/authentic2/manager/service_roles_table.html +++ b/src/authentic2/manager/templates/authentic2/manager/service_roles_table.html @@ -7,6 +7,6 @@ {% endblock %} {% block table.tbody.last.column %} - {% if table.context.view.can_change %}{% endif %} + {% if table.context.view.could_change %}{% endif %} {% endblock %} {% endif %} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html index 9a60b94a..661ce730 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html @@ -6,13 +6,13 @@ {% block appbar %} {{ block.super }} - {% if view.can_delete %} + {% if view.could_delete %} {% trans "Delete" %} {% else %} {% trans "Delete" %} {% endif %} - {% if view.can_change %} + {% if view.could_change %} {% trans "Edit" %} {% else %} {% trans "Edit" %} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_roles.html b/src/authentic2/manager/templates/authentic2/manager/user_roles.html index fa99f710..7320a76a 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_roles.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_roles.html @@ -33,7 +33,7 @@ {% render_table table "authentic2/manager/user_roles_table.html" %} {% endwith %} - {% if view.can_change %} + {% if view.could_change %} {% csrf_token %} {{ form }} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_roles_table.html b/src/authentic2/manager/templates/authentic2/manager/user_roles_table.html index d173a54f..eebb9dbb 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_roles_table.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_roles_table.html @@ -7,6 +7,6 @@ {% endblock %} {% block table.tbody.last.column %} - {% if table.context.view.can_change and row.record.member %}{% endif %} + {% if table.context.view.could_change and row.record.member %}{% endif %} {% endblock %} {% endif %} -- 2.20.1