From b41897dc98086649ecdde6ed15420eb8736bc78f Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Wed, 15 Jun 2016 02:29:43 +0300 Subject: [PATCH] Up Version with API --- SWSCloudAdministrator/Administrator/__init__.py | 4 ++-- cloud-runserver-admin.py | 7 +++++++ setup.py | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 cloud-runserver-admin.py diff --git a/SWSCloudAdministrator/Administrator/__init__.py b/SWSCloudAdministrator/Administrator/__init__.py index 43458bd..57287c4 100644 --- a/SWSCloudAdministrator/Administrator/__init__.py +++ b/SWSCloudAdministrator/Administrator/__init__.py @@ -33,8 +33,8 @@ viewAdministrator = Blueprint('administrator', __name__, url_prefix='/administra @viewAdministrator.route('/login.html', methods=['GET', 'POST']) def login(): if request.method == 'POST': - admin_email = request.form['email'].encode('utf-8') - admin_password = request.form['password'].encode('utf-8') + admin_email = request.form.get('email').encode('utf-8') + admin_password = request.form.get('password').encode('utf-8') # validation entered data if not validators.email(admin_email): diff --git a/cloud-runserver-admin.py b/cloud-runserver-admin.py new file mode 100644 index 0000000..2b193aa --- /dev/null +++ b/cloud-runserver-admin.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python +# coding: utf-8 + +from SWSCloudAdministrator import app + +if __name__ == '__main__': + app.run(host='0.0.0.0', port=5003, debug=True) diff --git a/setup.py b/setup.py index d1aafa2..04f1e06 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup( name='SWSCloudCore', - version='2.5.5', + version='2.5.6', author='Vyacheslav Anzhiganov', author_email='hello@anzhiganov.com', packages=[ @@ -76,6 +76,7 @@ setup( 'templates/default/vms/*.html', 'templates/email/simple/*.html', 'templates/email/simple/*.css', + # Errors 'templates/errors/*.html', ], 'SWSCloudAdministrator': [ @@ -116,6 +117,7 @@ setup( 'cloud-settings.py', 'cloud-settings-init.py', 'cloud-runserver.py', + 'cloud-runserver-admin.py', # accounts 'cloud-admin-add.py', # 'swscloud-admin-delete.py',