From 463ecdb7f5e12b91660fb9da34f721a8e34cf553 Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Wed, 1 Jun 2016 02:07:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/administrator/servers/edit.html    |  2 ++
 .../templates/administrator/servers/index.html   |  2 +-
 SWSCloudCore/views/administrator/__init__.py     | 16 +++++++++++-----
 setup.py                                         |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/SWSCloudCore/templates/administrator/servers/edit.html b/SWSCloudCore/templates/administrator/servers/edit.html
index 182cbdf..7239e53 100644
--- a/SWSCloudCore/templates/administrator/servers/edit.html
+++ b/SWSCloudCore/templates/administrator/servers/edit.html
@@ -5,6 +5,7 @@
 {% set subtitle="Edit server" %}
 
 {% block content %}
+<form action="" method="post">
     <table class="table table-bordered">
         <tr>
             <th>ID</th>
@@ -42,4 +43,5 @@
     </table>
     <input type="submit" value="Save changes" class="btn btn-success" />
     <a href="{{ url_for('administrator.servers_index') }}">Cancel</a>
+</form>
 {% endblock %}
\ No newline at end of file
diff --git a/SWSCloudCore/templates/administrator/servers/index.html b/SWSCloudCore/templates/administrator/servers/index.html
index 3d4fee8..3ec4785 100644
--- a/SWSCloudCore/templates/administrator/servers/index.html
+++ b/SWSCloudCore/templates/administrator/servers/index.html
@@ -38,7 +38,7 @@
                                 <span class="label label-success">Active</span>
                             {% endif %}
                         </td>
-                        <td><a href="{{ url_for('administrator.servers_edit', server_id=server.id) }}">Edit</a></td>
+                        <td><a href="{{ url_for('administrator.server_edit', server_id=server.id) }}">Edit</a></td>
                     </tr>
                 {% endfor %}
             {% endif %}
diff --git a/SWSCloudCore/views/administrator/__init__.py b/SWSCloudCore/views/administrator/__init__.py
index 1c2640b..4682a41 100644
--- a/SWSCloudCore/views/administrator/__init__.py
+++ b/SWSCloudCore/views/administrator/__init__.py
@@ -250,14 +250,15 @@ def datacenters_edit(dc_id):
 
 @viewAdministrator.route('/servers/')
 def servers_index():
+    ca = ControllerAdministrators()
+    cms = ControllerManageServer()
     # check session
-    if not ControllerAdministrators().check_session():
+    if not ca.check_session():
         return redirect(url_for("administrator.logout"))
     # auth user
-    if not ControllerAdministrators().auth(session['admin_email'], session['admin_password']):
+    if not ca.auth(session.get('admin_email'), session.get('admin_password')):
         return redirect(url_for("administrator.logout"))
     #
-    cms = ControllerManageServer()
     return render_template(
         'administrator/servers/index.html',
         servers=cms.items_get()
@@ -397,17 +398,22 @@ def servers_create():
 
 
 @viewAdministrator.route('/servers/edit/<uuid:server_id>.html', methods=['GET', 'POST'])
-def servers_edit(server_id):
+def server_edit(server_id):
     # check session
     if not ControllerAdministrators().check_session():
         return redirect(url_for("administrator.logout"))
     # auth user
-    if not ControllerAdministrators().auth(session['admin_email'], session['admin_password']):
+    if not ControllerAdministrators().auth(session.get('admin_email'), session.get('admin_password')):
         return redirect(url_for("administrator.logout"))
     # check exists server
     if models.Servers.select().where(models.Servers.id == server_id).count() == 0:
         return redirect(url_for('administrator.servers'))
 
+    if request.method == "POST":
+        x = models.Servers.update(status=request.form.get('status', 0)).where(models.Servers.id == server_id)
+        x.execute()
+        return redirect(url_for('administrator.server_edit', server_id=server_id))
+
     server_details = models.Servers.select().where(models.Servers.id == server_id).get()
 
     return render_template('administrator/servers/edit.html', server=server_details)
diff --git a/setup.py b/setup.py
index 7995f7f..52be622 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='SWSCloudCore',
-    version='2.4.7',
+    version='2.4.8',
     author='Vyacheslav Anzhiganov',
     author_email='hello@anzhiganov.com',
     packages=[