Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
84346f55
authored
Jun 03, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: link user profiles/groups on access lists
parent
e4de9b4e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
9 deletions
+30
-9
circle/dashboard/static/dashboard/dashboard.css
+8
-0
circle/dashboard/templates/dashboard/group-detail.html
+10
-5
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
+3
-2
circle/dashboard/templates/dashboard/vm-detail/access.html
+9
-2
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
84346f55
...
...
@@ -664,3 +664,11 @@ textarea[name="list-new-namelist"] {
text-decoration
:
none
;
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
;
}
circle/dashboard/templates/dashboard/group-detail.html
View file @
84346f55
...
...
@@ -54,8 +54,8 @@
<i
class=
"icon-user"
></i>
</td>
<td>
<
strong>
{{i.username}}
</strong>
,
{% include "dashboard/_display-name.html" with user=i show_org=True %}
<
a
href=
"{% url "
dashboard
.
views
.
profile
"
pk=
i.pk
%}"
title=
"{{ i.username }}"
>
{% include "dashboard/_display-name.html" with user=i show_org=True %}
</a>
</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>
...
...
@@ -93,8 +93,8 @@
<i
class=
"icon-user"
></i>
</td>
<td>
<
strong>
{{i.user}}
</strong>
,
{% include "dashboard/_display-name.html" with user=i.user show_org=True %}
<
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>
<select
class=
"form-control"
name=
"perm-u-{{i.user.id}}"
>
...
...
@@ -109,7 +109,12 @@
{% for i in acl.groups %}
<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>
<select
class=
"form-control"
name=
"perm-g-{{ i.group.pk }}"
>
{% for id, name in acl.levels %}
...
...
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
View file @
84346f55
...
...
@@ -8,9 +8,10 @@
{% if user.is_superuser %}
<a
href=
"{{ a.get_absolute_url }}"
>
{% endif %}
{{ a.get_readable_name }}{% if user.is_superuser %}
</a>
{% endif %}
</strong>
{{ a.started|date:"Y-m-d H:i" }}
{% if a.user %},
{{ a.started|date:"Y-m-d H:i" }}
{% 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 %}
</a>
{% endif %}
{% if a.is_abortable_for_user %}
<form
action=
"{{ a.instance.get_absolute_url }}"
method=
"POST"
class=
"pull-right"
>
...
...
circle/dashboard/templates/dashboard/vm-detail/access.html
View file @
84346f55
...
...
@@ -26,7 +26,10 @@
{% for i in acl.users %}
<tr>
<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>
<select
class=
"form-control"
name=
"perm-u-{{i.user.id}}"
>
{% for id, name in acl.levels %}
...
...
@@ -41,7 +44,11 @@
{% endfor %}
{% for i in acl.groups %}
<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>
<select
class=
"form-control"
name=
"perm-g-{{i.group.id}}"
>
{% for id, name in acl.levels %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment