diff --git a/netbox/templates/users/group.html b/netbox/templates/users/group.html index dd4b1aa8a..e4eee0812 100644 --- a/netbox/templates/users/group.html +++ b/netbox/templates/users/group.html @@ -5,11 +5,13 @@ {% block title %}{% trans "Group" %} {{ object.name }}{% endblock %} +{% block subtitle %}{% endblock %} + {% block content %}
-
{% trans "Account Details" %}
+
{% trans "Group" %}
@@ -23,13 +25,23 @@
{% trans "Users" %}
-
    +
    {% for user in object.user_set.all %} -
  • {{ user }}
    • + {{ user }} {% empty %} -
  • {% trans "None" %}
    • +
    {% trans "None" %}
    {% endfor %} -
+
+
+
+
{% trans "Assigned Permissions" %}
+
+ {% for perm in object.object_permissions.all %} + {{ perm }} + {% empty %} +
{% trans "None" %}
+ {% endfor %} +
diff --git a/netbox/templates/users/objectpermission.html b/netbox/templates/users/objectpermission.html index 26a5d06d3..4da5a6ea5 100644 --- a/netbox/templates/users/objectpermission.html +++ b/netbox/templates/users/objectpermission.html @@ -5,42 +5,92 @@ {% block title %}{% trans "Permission" %} {{ object.name }}{% endblock %} +{% block subtitle %}{% endblock %} + {% block content %}
-
{% trans "Account Details" %}
+
{% trans "Permission" %}
+ + + + + + + +
{% trans "Name" %} {{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
+
+
{% trans "Actions" %}
+
+ + + + + + + + + + + + + + + + + +
{% trans "View" %}{% checkmark object.can_view %}
{% trans "Add" %}{% checkmark object.can_add %}
{% trans "Change" %}{% checkmark object.can_change %}
{% trans "Delete" %}{% checkmark object.can_delete %}
+
+
+
+
{% trans "Constraints" %}
+
+ {% if object.constraints %} + 
{{ object.constraints|json }}
+ {% else %} + None + {% endif %} +
+
-
{% trans "Assigned Users" %}
+
{% trans "Object Types" %}
    - {% for user in object.users.all %} + {% for user in object.object_types.all %}
  • {{ user }}
    • - {% empty %} -
  • {% trans "None" %}
    • {% endfor %}
- +
+
{% trans "Assigned Users" %}
+
+ {% for user in object.users.all %} + {{ user }} + {% empty %} +
{% trans "None" %}
+ {% endfor %} +
+
{% trans "Assigned Groups" %}
-
    +
    {% for group in object.groups.all %} -
  • {{ group }}
    • + {{ group }} {% empty %} -
  • {% trans "None" %}
    • +
    {% trans "None" %}
    {% endfor %} -
+
diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html index 549144336..fe03f41ed 100644 --- a/netbox/templates/users/user.html +++ b/netbox/templates/users/user.html @@ -5,11 +5,13 @@ {% block title %}{% trans "User" %} {{ object.username }}{% endblock %} +{% block subtitle %}{% endblock %} + {% block content %}
-
{% trans "Account Details" %}
+
{% trans "User" %}
@@ -18,13 +20,7 @@ - + @@ -35,13 +31,17 @@ - - + + - + + + + +
{% trans "Full Name" %} - {% if object.first_name or object.last_name %} - {{ object.first_name }} {{ object.last_name }} - {% else %} - {{ ''|placeholder }} - {% endif %} - {{ object.get_full_name|placeholder }}
{% trans "Email" %}{{ object.date_joined|annotated_date }}
{% trans "Superuser" %}{% checkmark object.is_superuser %}{% trans "Active" %}{% checkmark object.active %}
{% trans "Admin Access" %}{% trans "Staff" %} {% checkmark object.is_staff %}
{% trans "Superuser" %}{% checkmark object.is_superuser %}
@@ -49,27 +49,25 @@
{% trans "Assigned Groups" %}
-
    +
    {% for group in object.groups.all %} -
  • {{ group }}
    • + {{ group }} {% empty %} -
  • {% trans "None" %}
    • +
    {% trans "None" %}
    {% endfor %} -
+
-
{% trans "Assigned Permissions" %}
-
    +
    {% for perm in object.object_permissions.all %} -
  • {{ perm }}
    • + {{ perm }} {% empty %} -
  • {% trans "None" %}
    • +
    {% trans "None" %}
    {% endfor %} -
+
- {% if perms.extras.view_objectchange %}