Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8e6400ed
authored
Jun 04, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: more strict user profile
parent
84346f55
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
5 deletions
+22
-5
circle/dashboard/templates/dashboard/profile.html
+2
-0
circle/dashboard/views.py
+20
-5
No files found.
circle/dashboard/templates/dashboard/profile.html
View file @
8e6400ed
...
...
@@ -35,6 +35,7 @@
<div
class=
"clearfix"
></div>
</div>
{% if perm_group_list %}
<hr
/>
<h4>
<i
class=
"icon-group"
></i>
Groups
...
...
@@ -46,6 +47,7 @@
{% trans "This user is not in any group." %}
{% endfor %}
</ul>
{% endif %}
<hr
/>
...
...
circle/dashboard/views.py
View file @
8e6400ed
...
...
@@ -2663,12 +2663,9 @@ class ProfileView(DetailView):
context
[
'instances_owned'
]
=
Instance
.
get_objects_with_level
(
"owner"
,
self
.
get_object
(),
disregard_superuser
=
True
)
.
filter
(
destroyed_at
=
None
)
context
[
'instances_with_access'
]
=
[
inst
for
inst
in
Instance
.
get_objects_with_level
(
context
[
'instances_with_access'
]
=
Instance
.
get_objects_with_level
(
"user"
,
self
.
get_object
(),
disregard_superuser
=
True
)
.
filter
(
destroyed_at
=
None
)
if
inst
not
in
context
[
'instances_owned'
]
]
)
.
filter
(
destroyed_at
=
None
)
.
exclude
(
pk__in
=
context
[
'instances_owned'
])
group_profiles
=
GroupProfile
.
get_objects_with_level
(
"operator"
,
self
.
request
.
user
)
...
...
@@ -2677,6 +2674,24 @@ class ProfileView(DetailView):
g
for
g
in
self
.
get_object
()
.
groups
.
all
()
if
g
in
groups
]
# permissions
# show groups only if the user is superuser, or have access
# to any of the groups the user belongs to
context
[
'perm_group_list'
]
=
(
self
.
request
.
user
.
is_superuser
or
len
(
context
[
'groups'
])
>
0
)
# filter the virtual machine list
# if the logged in user is not superuser or not the user itself
# filter the list so only those virtual machines are shown that are
# originated from templates the logged in user is operator or higher
if
(
not
(
self
.
request
.
user
.
is_superuser
or
self
.
request
.
user
==
self
.
get_object
())):
it
=
InstanceTemplate
.
get_objects_with_level
(
"operator"
,
self
.
request
.
user
)
context
[
'instances_owned'
]
=
context
[
'instances_owned'
]
.
filter
(
template__in
=
it
)
context
[
'instances_with_access'
]
=
context
[
'instances_with_access'
]
.
filter
(
template__in
=
it
)
return
context
def
get_avatar_url
(
self
):
...
...
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