j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Templates cleanup

Browse source
This commit is contained in:
Real-Gecko 2020-10-15 20:18:45 +06:00
parent 4f959eaee8
commit 01043ba8a8
42 changed files with 307 additions and 796 deletions
Download patch file Download diff file Expand all files Collapse all files

15
storages/templates/storage.html
View file

@ -1,17 +1,19 @@
{% extends "base.html" %}
{% load i18n %}
{% load staticfiles %}
{% block title %}{% trans "Storage" %} - {{ pool }}{% endblock %}
{% block title %}{{ compute }} - {% trans "Storage" %}: {{ pool }}{% endblock %}
{% block style %}
<link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}"/>
{% endblock %}
{% block content %}
<!-- Page Heading -->
{% block page_heading %}{{ compute }} - {% trans "Storage" %}: {{ pool }}{% endblock page_heading %}
{% block page_heading_extra %}{% include 'create_stg_vol_block.html' %}{% endblock page_heading_extra %}
{% block content %}
<div class="row">
<div class="col-lg-12">
{% include 'create_stg_vol_block.html' %}
<h2 class="page-header">{% trans "Storage" %}: {{ pool }}</h2>
<h2 class="page-header"></h2>
<ol class="breadcrumb bg-light shadow-sm">
<li class="breadcrumb-item active">
<a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
@ -37,9 +39,6 @@
</ol>
</div>
</div>
<!-- /.row -->
{% include 'errors_block.html' %}
<dl class="ml-3 row">
<dt class="col-6">{% trans "Pool name" %}</dt>

19
storages/templates/storages.html
View file

@ -1,14 +1,13 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Storages" %} - {{ compute.name }}{% endblock %}
{% block title %}{{ compute.name }} - {% trans "Storages" %}{% endblock %}
{% block page_heading %}{{ compute.name }} - {% trans "Storages" %}{% endblock page_heading %}
{% block page_heading_extra %}{% include 'create_stg_block.html' %}{% endblock page_heading_extra %}
{% block content %}
<!-- Page Heading -->
<div class="row">
<div class="col-lg-12">
{% include 'create_stg_block.html' %}
<h2 class="page-header">{{ compute.name }} - {% trans "Storages" %}</h2>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<nav aria-label="breadcrumb">
@ -38,10 +37,6 @@
</nav>
</div>
</div>
<!-- /.row -->
{% include 'errors_block.html' %}
<div class="row">
{% if not storages %}
<div class="col-lg-12">

17
storages/views.py
View file

@ -23,8 +23,8 @@ def storages(request, compute_id):
:return:
"""
error_messages = []
compute = get_object_or_404(Compute, pk=compute_id)
errors = False
try:
conn = wvmStorages(compute.hostname, compute.login, compute.password, compute.type)
@ -38,15 +38,18 @@ def storages(request, compute_id):
data = form.cleaned_data
if data['name'] in storages:
msg = _("Pool name already use")
error_messages.append(msg)
messages.error(request, msg)
errors = True
if data['stg_type'] == 'rbd':
if not data['secret']:
msg = _("You need create secret for pool")
error_messages.append(msg)
messages.error(request, msg)
errors = True
if not data['ceph_pool'] and not data['ceph_host'] and not data['ceph_user']:
msg = _("You need input all fields for creating ceph pool")
error_messages.append(msg)
if not error_messages:
messages.error(request, msg)
errors = True
if not errors:
if data['stg_type'] == 'rbd':
conn.create_storage_ceph(data['stg_type'], data['name'], data['ceph_pool'], data['ceph_host'],
data['ceph_user'], data['secret'])
@ -58,10 +61,10 @@ def storages(request, compute_id):
return HttpResponseRedirect(reverse('storage', args=[compute_id, data['name']]))
else:
for msg_err in form.errors.values():
error_messages.append(msg_err.as_text())
messages.error(request, msg_err.as_text())
conn.close()
except libvirtError as lib_err:
error_messages.append(lib_err)
messages.error(request, lib_err)
return render(request, 'storages.html', locals())