Merge pull request #1299 from ar4s/hotfix-management-ip-always-visible

Management IP form always visible
allegro · Feb 3, 2015 · ba82970 · ba82970
2 parents 171a68a + 684bc16
commit ba82970
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/src/ralph/ui/templates/ui/device_addresses.html b/src/ralph/ui/templates/ui/device_addresses.html
@@ -110,6 +110,22 @@ <h3>DHCP Entries</h3>
     </div>
 
     <div class="span6">
+        <h3>Management address</h3>
+        <form class="form form-inline" action="" method="POST">
+            {% csrf_token %}
+
+            {{ ip_management_form }}
+
+            {% if canedit %}
+                <div class="buttons pull-right">
+                    {% spaceless %}
+                    <button type="submit" name="management" value="Save" class="btn btn-primary"
+                    >{% icon 'fugue-tick' %}&nbsp;Save</button>
+                    {% endspaceless %}
+                </div>
+            {% endif %}
+        </form>
+
         <h3>Detected addresses</h3>
         <form class="form form-inline" action="" method="POST">
             {% csrf_token %}
@@ -179,24 +195,6 @@ <h3>Detected addresses</h3>
             {% endif %}
         </form>
 
-        {% if device.find_management %}
-            <h3>Management address</h3>
-            <form class="form form-inline" action="" method="POST">
-                {% csrf_token %}
-
-                {{ ip_management_form }}
-
-                {% if canedit %}
-                    <div class="buttons pull-right">
-                        {% spaceless %}
-                        <button type="submit" name="management" value="Save" class="btn btn-primary"
-                        >{% icon 'fugue-tick' %}&nbsp;Save</button>
-                        {% endspaceless %}
-                    </div>
-                {% endif %}
-            </form>
-        {% endif %}
-
         {% if balancers %}
             <h3>Load balancers</h3>
             <table class="table table-striped table-bordered details-balancers">