dashboard: add remove_port template

circle/dashboard/forms.py

@@ -948,21 +948,6 @@ class VmPortRemoveForm(OperationForm):
         if self.rule:
             self.fields['rule'].widget = HiddenInput()
 
-    @property
-    def helper(self):
-        helper = super(VmPortRemoveForm, self).helper
-        if self.rule:
-            helper.layout = Layout(
-                AnyTag(
-                    "div",
-                    HTML(format_html(_("<label>Port:</label> {0}/{1}"),
-                         escape(self.rule.dport), escape(self.rule.proto))),
-                    css_class="form-group",
-                ),
-                Field("rule"),
-            )
-        return helper
-
 
 class VmPortAddForm(OperationForm):
     port = forms.IntegerField(required=True, label=_('Port'),

circle/dashboard/templates/dashboard/_vm-remove-port.html

+{% extends "dashboard/operate.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block formfields %}
+  {% if form %}
+    {% crispy form %}
+  {% endif %}
+
+  {% if form.fields.rule.initial != None %}
+    {% with rule=form.fields.rule.initial %}
+      <dl>
+        <dt>{% trans "Port" %}:</dt>
+        <dd>{{ rule.dport }}/{{ rule.proto }}</dd>
+        <dt>{% trans "Host" %}:</dt>
+        <dd>{{ rule.host.hostname }}</dd>
+        <dt>{% trans "Vlan" %}:</dt>
+        <dd>{{ rule.host.vlan.name }}</dd>
+      </dl>
+    {% endwith %}
+  {% endif %}
+
+{% endblock %}

circle/dashboard/views/vm.py

@@ -418,6 +418,7 @@ class VmMigrateView(FormOperationMixin, VmOperationView):
 
 class VmPortRemoveView(FormOperationMixin, VmOperationView):
 
+    template_name = 'dashboard/_vm-remove-port.html'
     op = 'remove_port'
     show_in_toolbar = False
     with_reload = True