Browse Source

fix bug to set first instance default

Roberto Berto 5 years ago
parent
commit
99df958d6b

+ 10 - 2
vycenter/config/views.py

@@ -3,7 +3,7 @@ from django.http import HttpResponse
 from django.template import loader
 from django.shortcuts import redirect
 
-
+import pprint
 import vyos
 
 from .models import Instance
@@ -29,8 +29,16 @@ def instances(request):
     all_instances = vyos.instance_getall()
     hostname_default = vyos.get_hostname_prefered(request)
 
+    print(all_instances)
+
     if hostname_default == None:
-        return redirect('config:instance-add')
+        if all_instances.count() > 0:
+            for i in all_instances:
+                pprint.pprint(i.hostname)
+                instance_default(request, i.hostname)
+            
+        else:
+            return redirect('config:instance-add')
 
     template = loader.get_template('config/instances.html')
     context = { 

+ 1 - 1
vycenter/vycenter/templates/base.html

@@ -94,7 +94,7 @@
         
       <div class="row ">
         <div class="col-3 ">
-          <h1 align="left"><img src="https://storage.googleapis.com/imgvycenter/logo/logoreduzido20h.png" height="20" alt="vycenter"></h1>
+          <h1 align="left"><a href="/"><img src="https://storage.googleapis.com/imgvycenter/logo/logoreduzido20h.png" height="20" alt="vycenter"></a></h1>
         </div>
         <div class="col-9">
           <form action="/config/instance-default" method="get" id="instancedefault">

+ 6 - 1
vycenter/vycenter/templates/vycenter/vycenter_login.html

@@ -5,7 +5,12 @@
 
 {% block content %}
 
-<p>Auth not yet implemented. Proceed to <a href="{% url 'config:instances' %}">list os instances</a>.</p>
+<p>Auth not yet implemented. </p>
+
+<ul>
+    <li>First time? <a href="{% url 'config:instance-add' %}">create a new instance</a>.</p></li>
+    <li>Proceed to <a href="{% url 'config:instances' %}">list os instances</a>.</p></li>
+</ul>