Commit 84346f55 by Kálmán Viktor

dashboard: link user profiles/groups on access lists

parent e4de9b4e
...@@ -664,3 +664,11 @@ textarea[name="list-new-namelist"] { ...@@ -664,3 +664,11 @@ textarea[name="list-new-namelist"] {
text-decoration: none; text-decoration: none;
color: #555; color: #555;
} }
#group-detail-user-table td:nth-child(2) a,
#group-detail-perm-table td:nth-child(2) a,
#vm-access-table td:nth-child(2) a,
.no-style-link, .no-style-link:hover {
color: #555 !important;
text-decoration: none;
}
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<i class="icon-user"></i> <i class="icon-user"></i>
</td> </td>
<td> <td>
<strong>{{i.username}}</strong>, <a href="{% url "dashboard.views.profile" pk=i.pk %}" title="{{ i.username }}"
{% include "dashboard/_display-name.html" with user=i show_org=True %} >{% include "dashboard/_display-name.html" with user=i show_org=True %}</a>
</td> </td>
<td> <td>
<a data-group_pk="{{ group.pk }}" data-member_pk="{{i.pk}}" href="{% url "dashboard.views.remove-user" member_pk=i.pk group_pk=group.pk %}" class="real-link delete-from-group btn btn-link btn-xs"><i class="icon-remove"><span class="sr-only">{% trans "remove" %}</span></i></a> <a data-group_pk="{{ group.pk }}" data-member_pk="{{i.pk}}" href="{% url "dashboard.views.remove-user" member_pk=i.pk group_pk=group.pk %}" class="real-link delete-from-group btn btn-link btn-xs"><i class="icon-remove"><span class="sr-only">{% trans "remove" %}</span></i></a>
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
<i class="icon-user"></i> <i class="icon-user"></i>
</td> </td>
<td> <td>
<strong>{{i.user}}</strong>, <a href="{% url "dashboard.views.profile" pk=i.user.pk %}" title="{{ i.user.username }}"
{% include "dashboard/_display-name.html" with user=i.user show_org=True %} >{% include "dashboard/_display-name.html" with user=i.user show_org=True %}</a>
</td> </td>
<td> <td>
<select class="form-control" name="perm-u-{{i.user.id}}"> <select class="form-control" name="perm-u-{{i.user.id}}">
...@@ -109,7 +109,12 @@ ...@@ -109,7 +109,12 @@
{% for i in acl.groups %} {% for i in acl.groups %}
<tr> <tr>
<td><i class="icon-group"></i></td><td>{{ i.group }}</td> <td>
<i class="icon-group"></i>
</td>
<td>
<a href="{% url "dashboard.views.group-detail" pk=i.group.pk %}">{{ i.group }}</a>
</td>
<td> <td>
<select class="form-control" name="perm-g-{{ i.group.pk }}"> <select class="form-control" name="perm-g-{{ i.group.pk }}">
{% for id, name in acl.levels %} {% for id, name in acl.levels %}
......
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
{% if user.is_superuser %}<a href="{{ a.get_absolute_url }}">{% endif %} {% if user.is_superuser %}<a href="{{ a.get_absolute_url }}">{% endif %}
{{ a.get_readable_name }}{% if user.is_superuser %}</a>{% endif %} {{ a.get_readable_name }}{% if user.is_superuser %}</a>{% endif %}
</strong> </strong>
{{ a.started|date:"Y-m-d H:i" }} {{ a.started|date:"Y-m-d H:i" }}{% if a.user %},
{% if a.user %}, <a class="no-style-link" href="{% url "dashboard.views.profile" pk=a.user.pk %}">
{% include "dashboard/_display-name.html" with user=a.user show_org=True %} {% include "dashboard/_display-name.html" with user=a.user show_org=True %}
</a>
{% endif %} {% endif %}
{% if a.is_abortable_for_user %} {% if a.is_abortable_for_user %}
<form action="{{ a.instance.get_absolute_url }}" method="POST" class="pull-right"> <form action="{{ a.instance.get_absolute_url }}" method="POST" class="pull-right">
......
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
{% for i in acl.users %} {% for i in acl.users %}
<tr> <tr>
<td><i class="icon-user"></i></td> <td><i class="icon-user"></i></td>
<td>{{i.user}}</td> <td>
<a href="{% url "dashboard.views.profile" pk=i.user.pk %}" title="{{ i.user.username }}"
>{% include "dashboard/_display-name.html" with user=i.user show_org=True %}</a>
</td>
<td> <td>
<select class="form-control" name="perm-u-{{i.user.id}}"> <select class="form-control" name="perm-u-{{i.user.id}}">
{% for id, name in acl.levels %} {% for id, name in acl.levels %}
...@@ -41,7 +44,11 @@ ...@@ -41,7 +44,11 @@
{% endfor %} {% endfor %}
{% for i in acl.groups %} {% for i in acl.groups %}
<tr> <tr>
<td><i class="icon-group"></i></td><td>{{i.group}}</td> <td><i class="icon-group"></i></td>
<td>
<a href="{% url "dashboard.views.group-detail" pk=i.group.pk %}"
>{{ i.group.name }}</a>
</td>
<td> <td>
<select class="form-control" name="perm-g-{{i.group.id}}"> <select class="form-control" name="perm-g-{{i.group.id}}">
{% for id, name in acl.levels %} {% for id, name in acl.levels %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment