Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
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
ffbd9baa
authored
Sep 08, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: allow superuser start vm from any template
fixes #279
parent
c766e690
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
16 deletions
+17
-16
circle/dashboard/views.py
+17
-16
No files found.
circle/dashboard/views.py
View file @
ffbd9baa
...
@@ -2121,22 +2121,26 @@ class VmCreate(LoginRequiredMixin, TemplateView):
...
@@ -2121,22 +2121,26 @@ class VmCreate(LoginRequiredMixin, TemplateView):
raise
PermissionDenied
()
raise
PermissionDenied
()
form_error
=
form
is
not
None
form_error
=
form
is
not
None
template
=
(
form
.
template
.
pk
if
form_error
template_pk
=
(
form
.
template
.
pk
if
form_error
else
request
.
GET
.
get
(
"template"
))
else
request
.
GET
.
get
(
"template"
))
templates
=
InstanceTemplate
.
get_objects_with_level
(
if
template_pk
:
'user'
,
request
.
user
,
disregard_superuser
=
True
)
template
=
get_object_or_404
(
InstanceTemplate
,
pk
=
template_pk
)
if
form
is
None
and
template
:
if
not
template
.
has_level
(
request
.
user
,
'user'
):
form
=
self
.
form_class
(
user
=
request
.
user
,
raise
PermissionDenied
()
template
=
templates
.
get
(
pk
=
template
))
if
form
is
None
:
form
=
self
.
form_class
(
user
=
request
.
user
,
template
=
template
)
else
:
templates
=
InstanceTemplate
.
get_objects_with_level
(
'user'
,
request
.
user
,
disregard_superuser
=
True
)
context
=
self
.
get_context_data
(
**
kwargs
)
context
=
self
.
get_context_data
(
**
kwargs
)
if
template
:
if
template
_pk
:
context
.
update
({
context
.
update
({
'template'
:
'dashboard/_vm-create-2.html'
,
'template'
:
'dashboard/_vm-create-2.html'
,
'box_title'
:
_
(
'Customize VM'
),
'box_title'
:
_
(
'Customize VM'
),
'ajax_title'
:
True
,
'ajax_title'
:
True
,
'vm_create_form'
:
form
,
'vm_create_form'
:
form
,
'template_o'
:
template
s
.
get
(
pk
=
template
)
,
'template_o'
:
template
,
})
})
else
:
else
:
context
.
update
({
context
.
update
({
...
@@ -2162,18 +2166,15 @@ class VmCreate(LoginRequiredMixin, TemplateView):
...
@@ -2162,18 +2166,15 @@ class VmCreate(LoginRequiredMixin, TemplateView):
def
__create_customized
(
self
,
request
,
*
args
,
**
kwargs
):
def
__create_customized
(
self
,
request
,
*
args
,
**
kwargs
):
user
=
request
.
user
user
=
request
.
user
# no form yet, using POST directly:
template
=
get_object_or_404
(
InstanceTemplate
,
pk
=
request
.
POST
.
get
(
"template"
))
form
=
self
.
form_class
(
form
=
self
.
form_class
(
request
.
POST
,
user
=
request
.
user
,
request
.
POST
,
user
=
request
.
user
,
template
=
template
)
template
=
InstanceTemplate
.
objects
.
get
(
pk
=
request
.
POST
.
get
(
"template"
)
)
)
if
not
form
.
is_valid
():
if
not
form
.
is_valid
():
return
self
.
get
(
request
,
form
,
*
args
,
**
kwargs
)
return
self
.
get
(
request
,
form
,
*
args
,
**
kwargs
)
post
=
form
.
cleaned_data
post
=
form
.
cleaned_data
template
=
InstanceTemplate
.
objects
.
get
(
pk
=
post
[
'template'
])
# permission check
if
not
template
.
has_level
(
user
,
'user'
):
if
not
template
.
has_level
(
user
,
'user'
):
raise
PermissionDenied
()
raise
PermissionDenied
()
...
...
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