Closes #1320: Remove checkbox from confirmation dialog

netbox-community · Jul 12, 2017 · 1ef9090 · 1ef9090
1 parent 74828e1
commit 1ef9090
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
@@ -1694,8 +1694,7 @@ def clean_interface_b(self):
         return interface
 
 
-class InterfaceConnectionDeletionForm(BootstrapMixin, forms.Form):
-    confirm = forms.BooleanField(required=True)
+class InterfaceConnectionDeletionForm(ConfirmationForm):
     # Used for HTTP redirect upon successful deletion
     device = forms.ModelChoiceField(queryset=Device.objects.all(), widget=forms.HiddenInput(), required=False)
 

diff --git a/netbox/templates/utilities/confirmation_form.html b/netbox/templates/utilities/confirmation_form.html
@@ -5,22 +5,14 @@
 <div class="row">
 	<div class="col-md-6 col-md-offset-3">
         <form action="." method="post" class="form">
-        {% csrf_token %}
-        {% for field in form.hidden_fields %}
-            {{ field }}
-        {% endfor %}
+            {% csrf_token %}
+            {% for field in form.hidden_fields %}
+                {{ field }}
+            {% endfor %}
             <div class="panel panel-{{ panel_class|default:"danger" }}">
                 <div class="panel-heading">{% block title %}{% endblock %}</div>
                 <div class="panel-body">
                     {% block message %}<p>Are you sure?</p>{% endblock %}
-                    <div class="form-group">
-                        <div class="checkbox{% if form.confirm.errors %} has-error{% endif %}">
-                            <label for="{{ form.confirm.id_for_label }}">
-                                {{ form.confirm }}
-                                {{ form.confirm.label }}
-                            </label>
-                        </div>
-                    </div>
                     <div class="text-right">
                         <button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"danger" }}">Confirm</button>
                         <a href="{{ return_url }}" class="btn btn-default">Cancel</a>

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
@@ -510,7 +510,7 @@ class ConfirmationForm(BootstrapMixin, ReturnURLForm):
     """
     A generic confirmation form. The form is not valid unless the confirm field is checked.
     """
-    confirm = forms.BooleanField(required=True)
+    confirm = forms.BooleanField(required=True, widget=forms.HiddenInput(), initial=True)
 
 
 class BulkEditForm(forms.Form):