Skip to content

some fixes ... #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
catborise merged 3 commits into from
Sep 13, 2021
Merged

some fixes ... #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
536caac
add title info to vm which list under computes
catborise Aug 25, 2021
890f592
also show add flavor button if there is not any
catborise Sep 13, 2021
607e396
update requirements
catborise Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions computes/templates/computes/instances.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
{% for instance in instances %}
<tr>
<td>
<a class="link-primary" href="{% url 'instances:instance' instance.id %}">
{{ instance.name }}
</a>
<a class="link-primary" href="{% url 'instances:instance' instance.id %}">{{ instance.name }}</a>
<br>
<p class="m-0 small fst-italic">{{ instance.title }}</p>
</td>
<td>
<em>
Expand Down
8 changes: 4 additions & 4 deletions conf/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Django==3.2.6
django_bootstrap5==2.1.1
Django==3.2.7
django_bootstrap5==2.1.2
django-icons==4.0.0
django-login-required-middleware==0.6.1
django-otp==1.0.6
django-qr-code==2.2.0
gunicorn==20.1.0
libsass==0.21.0
libvirt-python==7.6.0
libvirt-python==7.7.0
lxml==4.6.3
qrcode==7.2
qrcode==7.3
rwlock==0.0.7
websockify==0.10.0
zipp==3.5.0
Expand Down
4 changes: 2 additions & 2 deletions dev/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-r ../conf/requirements.txt
coverage==5.5
django-debug-toolbar==3.2.1
django-debug-toolbar==3.2.2
pycodestyle==2.7.0
pyflakes==2.3.1
pylint==2.9.6
pylint==2.10.2
yapf==0.31.0
2 changes: 1 addition & 1 deletion instances/templates/create_inst_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</a>

<!-- Modal pool -->
<div class="modal fade" id="AddInstance" tabindex="-1" role="dialog" aria-labelledby="AddNetPoolLabel" aria-hidden="true">
<div class="modal fade" id="AddInstance" tabindex="-1" role="dialog" aria-labelledby="AddInstanceModal" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
Expand Down
4 changes: 2 additions & 2 deletions instances/templates/create_instance_w2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane tab-pane-bordered active" id="flavor">
{% include 'create_flav_block.html' %}
<h3 class="page-header">{% trans "Create from flavor" %}</h3>
{% if not flavors %}
<div class="col-lg-12">
<div class="alert alert-warning shadow-sm">
<i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "Hypervisor doesn't have any Flavors" %}
</div>
</div>
{% else %}
{% include 'create_flav_block.html' %}
<h3 class="page-header">{% trans "Create from flavor" %}</h3>
<div class="table-responsive">
<table class="table table-hover">
<thead>
Expand Down