Skip to content

Gelencsér Szabolcs / cloud

Go to a project
Commit b722b632 by Oláh István Gergely
Options

dashboard: fix node flush templates, check is None to post flush

parent 39f2c65c
Showing with 20 additions and 17 deletions
circle/dashboard/templates/dashboard/confirm/ajax-node-flush.html
...@@ -3,19 +3,24 @@ ...@@ -3,19 +3,24 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
{% if text %}
{{ text }} {% if text %}
{% else %} {{ text }}
{%blocktrans with object=object%} {% else %}
Are you sure you want to flush <strong>{{ object }}</strong>? {%blocktrans with object=object%}
{%endblocktrans%} Are you sure you want to flush <strong>{{ object }}</strong>?
{% endif %} {%endblocktrans%}
<br /> {% endif %}
<div class="pull-right" style="margin-top: 15px;"> <div class="pull-right">
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button> <form action="" method="POST">
<button id="confirmation-modal-button" type="button" class="btn btn-warning">{% trans "Flush" %}</button> {% csrf_token %}
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
<input type="hidden" name="flush" value=""/>
<button class="btn btn-warning">{% trans "Yes" %}</button>
</form>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
......
circle/dashboard/templates/dashboard/confirm/node-flush.html
{% extends "dashboard/base.html" %} {% extends "dashboard/base.html" %}
{% load i18n %} {% load i18n %}
{% block content %} {% block content %}
<div class="body-content"> <div class="body-content">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -25,8 +24,8 @@ ...@@ -25,8 +24,8 @@
<form action="" method="POST"> <form action="" method="POST">
{% csrf_token %} {% csrf_token %}
<a class="btn btn-default">{% trans "Back" %}</a> <a class="btn btn-default">{% trans "Back" %}</a>
<input type="hidden" name="next" value="{{ request.GET.next }}"/> <input type="hidden" name="flush" value=""/>
<button class="btn btn-warning">{% trans "Yes, flush" %}</button> <button class="btn btn-warning">{% trans "Yes" %}</button>
</form> </form>
</div> </div>
</div> </div>
......
circle/dashboard/views.py
...@@ -497,14 +497,13 @@ class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin, DetailView): ...@@ -497,14 +497,13 @@ class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin, DetailView):
return context return context
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
print request.POST
if request.POST.get('new_name'): if request.POST.get('new_name'):
return self.__set_name(request) return self.__set_name(request)
if request.POST.get('change_status') is not None: if request.POST.get('change_status') is not None:
return self.__set_status(request) return self.__set_status(request)
if request.POST.get('to_remove'): if request.POST.get('to_remove'):
return self.__remove_trait(request) return self.__remove_trait(request)
if request.POST.get('flush'): if request.POST.get('flush') is not None:
return self.__flush(request) return self.__flush(request)
return redirect(reverse_lazy("dashboard.views.node-detail", return redirect(reverse_lazy("dashboard.views.node-detail",
kwargs={'pk': self.get_object().pk})) kwargs={'pk': self.get_object().pk}))
......
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