diff --git a/SWSCloudCore/templates/administrator/_layout.auth.html b/SWSCloudCore/templates/administrator/_layout.auth.html
index c6ffd21..32ae34d 100644
--- a/SWSCloudCore/templates/administrator/_layout.auth.html
+++ b/SWSCloudCore/templates/administrator/_layout.auth.html
@@ -38,6 +38,7 @@
Datacenters
Servers
IPs
+ Tasks
Traffic
diff --git a/SWSCloudCore/templates/administrator/tasks/index.html b/SWSCloudCore/templates/administrator/tasks/index.html
new file mode 100644
index 0000000..3a24698
--- /dev/null
+++ b/SWSCloudCore/templates/administrator/tasks/index.html
@@ -0,0 +1,43 @@
+{% extends 'administrator/_layout.auth.html' %}
+
+{% set title="Infrastructure" %}
+{% set subtitle="Tasks" %}
+
+{% block content %}
+
+
+
+ Info |
+ Task |
+
+
+
+ {% if tasks|length == 0 %}
+
+ No tasks. |
+
+ {% else %}
+ {% for task in tasks %}
+
+
+
+ - ID: {{ task.id }}
+ - DC: {{ task.datacenter.name }}
+ - Server: {{ task.server.hostname }}
+ - User: {{ task.user.email }}
+ - Created: {{ task.created }}
+ - Status: {{ task.status }}
+
+ |
+
+
+ - {{ task.task }}
+ - {{ task.plain }}
+
+ |
+
+ {% endfor %}
+ {% endif %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/SWSCloudCore/views/administrator/__init__.py b/SWSCloudCore/views/administrator/__init__.py
index 62b64d7..dc11bf0 100644
--- a/SWSCloudCore/views/administrator/__init__.py
+++ b/SWSCloudCore/views/administrator/__init__.py
@@ -222,7 +222,7 @@ def datacenters_edit(dc_id):
cmd = ControllerManageDatacenters()
return render_template(
- 'administrator/datacenters_edit.html',
+ 'administrator/datacenters/edit.html',
datacenter=cmd.item_get(dc_id)
)
@@ -268,13 +268,14 @@ def ips_create():
return redirect(url_for("administrator.logout"))
#
if request.method == "POST":
+ print request.form
if ControllerManageIPs().is_valid_ipv4_address(request.form['ipv4'])\
and ControllerManageIPs().is_valid_ipv4_address(request.form['ipv4_gateway']):
ControllerManageIPs().item_create(
- request.form['datacenter_id'],
- request.form['server_id'],
- request.form['ipv4'],
- request.form['ipv4_gateway'],
+ request.form.get('datacenter'),
+ request.form.get('server'),
+ request.form.get('ipv4'),
+ request.form.get('ipv4_gateway'),
'',
'',
0
@@ -282,8 +283,8 @@ def ips_create():
if ControllerManageIPs().is_valid_ipv6_address(request.form['ipv6'])\
and ControllerManageIPs().is_valid_ipv6_address(request.form['ipv6_gateway']):
ControllerManageIPs().item_create(
- request.form['datacenter_id'],
- request.form['server_id'],
+ request.form['datacenter'],
+ request.form['server'],
'',
'',
request.form['ipv6'],
@@ -488,3 +489,13 @@ def settings_messages_email_test():
@viewAdministrator.route('/json/datacenter/list', methods=['GET'])
def json_datacenter_list():
return jsonify(ControllerManageDatacenters().items_get())
+
+
+@viewAdministrator.route('/tasks/', methods=['GET'])
+def tasks_index():
+ from SWSCloudCore.controllers.tasks.manage import ControllerManageTasks
+ return render_template(
+ 'administrator/tasks/index.html',
+ # tasks=ControllerManageTasks().get_by_server().get()
+ tasks=ControllerManageTasks().get()
+ )