Bump version, updated Django for security patch release

ralgozino · Feb 12, 2020 · 2f11e94 · 2f11e94
1 parent d24742f
commit 2f11e94
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
   #     POSTGRES_DB: "vmtory"
   vcsim:
     image: ralgozino/vcsim:20190921
-    build: vcsim
+    # build: vcsim
     ports:
       - "8989:8989"
     entrypoint: ["/go/bin/vcsim", "-esx", "-ds=2", "-l=0.0.0.0:8989", "-vm=50"]

diff --git a/vminventory/vmtory/templates/base.html b/vminventory/vmtory/templates/base.html
@@ -72,7 +72,7 @@
         {% endblock %}
         <div class="ui vertical mini footer segment">
             <div class="ui center aligned container">
-                <p>VMtory v1.0.6 {% blocktrans %} is licensed under the GNU GPLv3 open source software license{% endblocktrans %} | <a href="https://github.com/ralgozino/vmtory/issues">{% blocktrans %}Report an issue{% endblocktrans %}</a></p>
+                <p>VMtory v1.0.7 {% blocktrans %} is licensed under the GNU GPLv3 open source software license{% endblocktrans %} | <a href="https://github.com/ralgozino/vmtory/issues">{% blocktrans %}Report an issue{% endblocktrans %}</a></p>
             </div>
         </div>
         <script type="text/javascript">

diff --git a/vminventory/vmtory/views.py b/vminventory/vmtory/views.py
@@ -102,7 +102,14 @@ def myvms(request):
         table_deleted = DeletedVMTable(deleted_vms)
         table_deleted.prefix = 'deleted_vms'
         RequestConfig(request).configure(table_deleted)
-    return render(request, 'myvms.html', {'favs': favs_table, 'vms': table, 'deleted_vms': table_deleted, 'viewfilter': 'myvms', 'page_title': _('My VMs')})
+
+    return render(request, 'myvms.html', {'favs': favs_table,
+                                          'vms': table,
+                                          'deleted_vms': table_deleted,
+                                          'viewfilter': 'myvms',
+                                          'page_title': _('My VMs')
+                                          }
+                    )
 
 
 @login_required
@@ -642,7 +649,7 @@ def ipam(request):
         ips = VM.objects.filter(deleted=False).values('ip_address')
         reserved_ips = ReservedIPAddress.objects.all()
         networks = onetworks = {}
-        environments: Environment.objects.all()
+        # environments = Environment.objects.all()
 
         for ip_address in ips:
             ip = ip_address.get('ip_address')