From 892f69fdc8de87c472d29916379f83de90434598 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Mon, 1 Aug 2016 09:44:55 +0300 Subject: [PATCH] update homepage and footer part --- SWSCloudServerAPI/ServerAPI/__init__.py | 28 ++++++++----------- SWSCloudWeb/templates/default/_footer.html | 16 ++++++++--- .../templates/default/homepage/index.html | 18 ++++++------ SWSCloudWeb/views/account/__init__.py | 4 +-- cloud-dc-ls.py | 8 ++++++ setup.py | 2 +- 6 files changed, 44 insertions(+), 32 deletions(-) diff --git a/SWSCloudServerAPI/ServerAPI/__init__.py b/SWSCloudServerAPI/ServerAPI/__init__.py index d2c1151..e2dc7ac 100644 --- a/SWSCloudServerAPI/ServerAPI/__init__.py +++ b/SWSCloudServerAPI/ServerAPI/__init__.py @@ -45,16 +45,15 @@ def tasks_list(): result = dict(tasks=list()) for task in server_api.get(): - result['results'].append({ - 'id': task.id, - 'datacenter': task.datacenter.id, - 'server': task.server.id, - 'user': task.user.id, - 'task': task.task, - 'created': task.created, - 'status': task.status, - 'plain': json.loads(task.plain), - }) + result['results'].append(dict( + id=task.id, + datacenter=task.datacenter.id, + server=task.server.id, + user=task.user.id, + task=task.task, + created=task.created, + status=task.status, + plain=json.loads(task.plain))) return jsonify(result) @@ -82,10 +81,7 @@ def task_item(): status=task.status, plain=json.loads(task.plain), ) - return jsonify( - task=result, - status='success' - ) + return jsonify(task=result, status='success') @viewServerAPI.route('/tasks/', methods=['PUT']) @@ -97,9 +93,9 @@ def task_update(task_id): server_api = ControllerTasksServer(g.server_id) if 'status' in request.form: - status = int(request.form['status']) + status = int(request.form.get('status')) server_api.update(task_id, status) - return jsonify({'status': 0}) + return jsonify(status=0) # CONTAINERS diff --git a/SWSCloudWeb/templates/default/_footer.html b/SWSCloudWeb/templates/default/_footer.html index 83d2a96..08c380d 100644 --- a/SWSCloudWeb/templates/default/_footer.html +++ b/SWSCloudWeb/templates/default/_footer.html @@ -1,12 +1,20 @@