Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a4126adf
authored
Jun 06, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: add FormOperationMixin
parent
e4141022
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
4 deletions
+37
-4
circle/dashboard/templates/dashboard/operate.html
+6
-1
circle/dashboard/views.py
+31
-3
No files found.
circle/dashboard/templates/dashboard/operate.html
View file @
a4126adf
{% load i18n %}
{% load crispy_forms_tags %}
{% block question %}
<p>
...
...
@@ -10,7 +11,11 @@ Do you want to do the following operation on {{obj}}:
<p
class=
"text-info"
>
{{op.name}}: {{op.description}}
</p>
{% endblock %}
<form
method=
"POST"
action=
"{{url}}"
>
{% csrf_token %}
{% block formfields %}{% endblock %}
{% block formfields %}
{% if form %}
{% crispy form %}
{% endif %}
{% endblock %}
<div
class=
"pull-right"
>
<a
class=
"btn btn-default"
href=
"{{object.get_absolute_url}}"
data-dismiss=
"modal"
>
{% trans "Cancel" %}
</a>
...
...
circle/dashboard/views.py
View file @
a4126adf
...
...
@@ -258,11 +258,13 @@ class VmDetailView(CheckedDetailView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
VmDetailView
,
self
)
.
get_context_data
(
**
kwargs
)
instance
=
context
[
'instance'
]
ops
=
get_operations
(
instance
,
self
.
request
.
user
)
context
.
update
({
'graphite_enabled'
:
VmGraphView
.
get_graphite_url
()
is
not
None
,
'vnc_url'
:
reverse_lazy
(
"dashboard.views.detail-vnc"
,
kwargs
=
{
'pk'
:
self
.
object
.
pk
}),
'ops'
:
get_operations
(
instance
,
self
.
request
.
user
),
'ops'
:
ops
,
'op'
:
{
i
.
op
:
i
for
i
in
ops
},
})
# activity data
...
...
@@ -501,6 +503,7 @@ class VmDetailView(CheckedDetailView):
class
OperationView
(
DetailView
):
template_name
=
'dashboard/operate.html'
show_in_toolbar
=
True
@property
def
name
(
self
):
...
...
@@ -575,6 +578,30 @@ class VmOperationView(OperationView):
context_object_name
=
'instance'
# much simpler to mock object
class
FormOperationMixin
(
object
):
form_class
=
None
def
get_context_data
(
self
,
**
kwargs
):
ctx
=
super
(
FormOperationMixin
,
self
)
.
get_context_data
(
**
kwargs
)
if
self
.
request
.
method
==
'POST'
:
ctx
[
'form'
]
=
self
.
form_class
(
self
.
request
.
POST
)
else
:
ctx
[
'form'
]
=
self
.
form_class
()
return
ctx
def
post
(
self
,
request
,
extra
=
None
,
*
args
,
**
kwargs
):
if
extra
is
None
:
extra
=
{}
form
=
self
.
form_class
(
self
.
request
.
POST
)
if
form
.
is_valid
():
extra
.
update
(
form
.
cleaned_data
)
return
super
(
FormOperationMixin
,
self
)
.
post
(
request
,
extra
,
*
args
,
**
kwargs
)
else
:
return
self
.
get
(
request
)
class
VmMigrateView
(
VmOperationView
):
op
=
'migrate'
...
...
@@ -638,8 +665,9 @@ def get_operations(instance, user):
op
=
v
.
get_op_by_object
(
instance
)
op
.
check_auth
(
user
)
op
.
check_precond
()
except
:
pass
# unavailable
except
Exception
as
e
:
logger
.
debug
(
'Not showing operation
%
s for
%
s:
%
s'
,
k
,
instance
,
unicode
(
e
))
else
:
ops
.
append
(
v
.
bind_to_object
(
instance
))
return
ops
...
...
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