From 835e11c206aa3782ebbe3a46bfec0a67a92ea98a Mon Sep 17 00:00:00 2001
From: Johanna England <johanna.england@sikt.no>
Date: Tue, 12 Nov 2024 12:25:03 +0100
Subject: [PATCH] Remove fallback form rendering from uncrispified forms

For more information see #3140 and #3157
---
 .../nav/web/templates/alertprofiles/base_detail.html |  6 +-----
 .../templates/alertprofiles/subscription_form.html   |  6 +-----
 .../web/templates/alertprofiles/timeperiod_edit.html |  6 +-----
 .../web/templates/alertprofiles/timeperiod_form.html |  6 +-----
 python/nav/web/templates/arnold/justifications.html  |  6 +-----
 .../web/templates/devicehistory/history_search.html  |  6 +-----
 .../web/templates/devicehistory/history_view.html    |  6 +-----
 python/nav/web/templates/ipdevinfo/modules.html      |  6 +-----
 python/nav/web/templates/ipdevinfo/search.html       |  6 +-----
 .../nav/web/templates/ipdevinfo/sensor-details.html  |  6 +-----
 python/nav/web/templates/macwatch/addmacwatch.html   |  6 +-----
 python/nav/web/templates/maintenance/new_task.html   |  6 +-----
 python/nav/web/templates/messages/save.html          |  6 +-----
 python/nav/web/templates/navlets/alert_edit.html     |  6 +-----
 python/nav/web/templates/portadmin/base.html         |  6 +-----
 python/nav/web/templates/seeddb/netbox_wizard.html   |  6 +-----
 .../nav/web/templates/sortedstats/sortedstats.html   |  6 +-----
 python/nav/web/templates/status2/status.html         |  6 +-----
 .../nav/web/templates/threshold/set_threshold.html   |  6 +-----
 python/nav/web/templates/useradmin/group_detail.html |  6 +-----
 python/nav/web/templates/webfront/login.html         |  6 +-----
 python/nav/web/templates/webfront/preferences.html   | 12 ++----------
 22 files changed, 23 insertions(+), 115 deletions(-)

diff --git a/python/nav/web/templates/alertprofiles/base_detail.html b/python/nav/web/templates/alertprofiles/base_detail.html
index c4aed7a100..289d22f20b 100644
--- a/python/nav/web/templates/alertprofiles/base_detail.html
+++ b/python/nav/web/templates/alertprofiles/base_detail.html
@@ -14,11 +14,7 @@ <h4>
   </h4>
 
   <form action="{% block url_edit %}{% endblock %}" method="post" >
-    {% if form.attrs %}
-      {% include 'custom_crispy_templates/_form_content.html' %}
-    {% else %}
-      {{ form }}
-    {% endif %}
+    {% include 'custom_crispy_templates/_form_content.html' %}
 
     {% block form_additional_fields %}
     {% endblock %}
diff --git a/python/nav/web/templates/alertprofiles/subscription_form.html b/python/nav/web/templates/alertprofiles/subscription_form.html
index 55b46a7a79..65eb0caa24 100644
--- a/python/nav/web/templates/alertprofiles/subscription_form.html
+++ b/python/nav/web/templates/alertprofiles/subscription_form.html
@@ -83,11 +83,7 @@ <h5>{{ editing|yesno:"Edit,Add new" }} subscription</h5>
               <a href="{% url 'alertprofiles-filter_groups-new' %}">Add your first filter group</a> to fix this problem.
             </div>
         {% endif %}
-          {% if form.attrs %}
-            {% include 'custom_crispy_templates/_form_content.html' %}
-          {% else %}
-            {{ form }}
-          {% endif %}
+          {% include 'custom_crispy_templates/_form_content.html' %}
           <input type="submit" value="{{ editing|yesno:"Save,Add" }}" class="button small"/>
         </div>
     </form>
diff --git a/python/nav/web/templates/alertprofiles/timeperiod_edit.html b/python/nav/web/templates/alertprofiles/timeperiod_edit.html
index 6fc7c471f9..5be4056737 100644
--- a/python/nav/web/templates/alertprofiles/timeperiod_edit.html
+++ b/python/nav/web/templates/alertprofiles/timeperiod_edit.html
@@ -4,10 +4,6 @@
 
 <form action="{% url 'alertprofiles-profile-timeperiod-add' %}" method="post">
     <input type="hidden" name="valid_during" value="{{ time_period.valid_during }}" />
-    {% if time_period_form.attrs %}
-        {% include 'custom_crispy_templates/_form_content.html' with form=time_period_form %}
-    {% else %}
-        {{ time_period_form }}
-    {% endif %}
+    {% include 'custom_crispy_templates/_form_content.html' with form=time_period_form %}
 </form>
 {% endblock %}
diff --git a/python/nav/web/templates/alertprofiles/timeperiod_form.html b/python/nav/web/templates/alertprofiles/timeperiod_form.html
index 3ce021324b..4882592b18 100644
--- a/python/nav/web/templates/alertprofiles/timeperiod_form.html
+++ b/python/nav/web/templates/alertprofiles/timeperiod_form.html
@@ -4,8 +4,4 @@ <h4>Edit time period</h4>
     <h4>Add new time period</h4>
 {% endif %}
 
-{% if time_period_form.attrs %}
-    {% include 'custom_crispy_templates/_form_content.html' with form=time_period_form %}
-{% else %}
-    {{ time_period_form }}
-{% endif %}
+{% include 'custom_crispy_templates/_form_content.html' with form=time_period_form %}
diff --git a/python/nav/web/templates/arnold/justifications.html b/python/nav/web/templates/arnold/justifications.html
index a9bb20aff1..c9bb74954e 100644
--- a/python/nav/web/templates/arnold/justifications.html
+++ b/python/nav/web/templates/arnold/justifications.html
@@ -50,11 +50,7 @@
 
         {% comment %} Form for creating new justifications {% endcomment %}
         <div class="medium-6 column">
-            {% if form.attrs %}
-                {% include 'custom_crispy_templates/flat_form.html' %}
-            {% else %}
-                {{ form }}
-            {% endif %}
+            {% include 'custom_crispy_templates/flat_form.html' %}
         </div>
 
     </div>
diff --git a/python/nav/web/templates/devicehistory/history_search.html b/python/nav/web/templates/devicehistory/history_search.html
index fb8da9f750..29b7401084 100644
--- a/python/nav/web/templates/devicehistory/history_search.html
+++ b/python/nav/web/templates/devicehistory/history_search.html
@@ -10,11 +10,7 @@
     <form action="{% url 'devicehistory-search' %}" method="get">
         <div class="row">
             <div class="large-8 column">
-              {% if form.attrs %}
-                {% include 'custom_crispy_templates/_form_content.html' %}
-              {% else %}
-                {{ form }}
-              {% endif %}
+              {% include 'custom_crispy_templates/_form_content.html' %}
             </div>
         </div>
         <div class="row">
diff --git a/python/nav/web/templates/devicehistory/history_view.html b/python/nav/web/templates/devicehistory/history_view.html
index da833980fe..801e8d515c 100644
--- a/python/nav/web/templates/devicehistory/history_view.html
+++ b/python/nav/web/templates/devicehistory/history_view.html
@@ -11,11 +11,7 @@
             <input type="hidden" name="{{ type }}" value="{{ id }}" />
           {% endfor %}
         {% endfor %}
-        {% if form.attrs %}
-          {% include 'custom_crispy_templates/_form_content.html' %}
-        {% else %}
-          {{ form }}
-        {% endif %}
+        {% include 'custom_crispy_templates/_form_content.html' %}
         <input type="submit" class="button small" value="Filter">
       </form>
     </div>
diff --git a/python/nav/web/templates/ipdevinfo/modules.html b/python/nav/web/templates/ipdevinfo/modules.html
index 100dfcee07..96b02bb271 100644
--- a/python/nav/web/templates/ipdevinfo/modules.html
+++ b/python/nav/web/templates/ipdevinfo/modules.html
@@ -7,11 +7,7 @@ <h5>
   <div class="row">
     <div class="medium-6 column">
       <form id="switchport_activity_recheck" action="" method="get">
-        {% if activity_interval_form.attrs %}
-          {% include 'custom_crispy_templates/_form_content.html' with form=activity_interval_form %}
-        {% else %}
-          {{ activity_interval_form }}
-        {% endif %}
+        {% include 'custom_crispy_templates/_form_content.html' with form=activity_interval_form %}
       </form>
     </div>
     <div class="medium-6 column">
diff --git a/python/nav/web/templates/ipdevinfo/search.html b/python/nav/web/templates/ipdevinfo/search.html
index 723a38bccc..4c8bbd3725 100644
--- a/python/nav/web/templates/ipdevinfo/search.html
+++ b/python/nav/web/templates/ipdevinfo/search.html
@@ -6,11 +6,7 @@ <h4>IP Device search</h4>
 
 <div class="row">
     <div class="column medium-6">
-        {% if search_form.attrs %}
-            {% include 'custom_crispy_templates/flat_form.html' with form=search_form %}
-        {% else %}
-            {{ search_form }}
-        {% endif %}
+        {% include 'custom_crispy_templates/flat_form.html' with form=search_form %}
     </div>
 </div>
 
diff --git a/python/nav/web/templates/ipdevinfo/sensor-details.html b/python/nav/web/templates/ipdevinfo/sensor-details.html
index 096aee7d9f..e8968d2283 100644
--- a/python/nav/web/templates/ipdevinfo/sensor-details.html
+++ b/python/nav/web/templates/ipdevinfo/sensor-details.html
@@ -104,11 +104,7 @@ <h4>Display values</h4>
             Add to dashboard
           </button>
           <form method="post">
-            {% if form.attrs %}
-              {% include 'custom_crispy_templates/_form_content.html' %}
-            {% else %}
-              {{ form }}
-            {% endif %}
+            {% include 'custom_crispy_templates/_form_content.html' %}
             <button type="submit" class="button small">Update settings</button>
           </form>
         {% else %}
diff --git a/python/nav/web/templates/macwatch/addmacwatch.html b/python/nav/web/templates/macwatch/addmacwatch.html
index 134ed23cb2..97495ef1c7 100644
--- a/python/nav/web/templates/macwatch/addmacwatch.html
+++ b/python/nav/web/templates/macwatch/addmacwatch.html
@@ -5,11 +5,7 @@
     <div class="row">
         <div class="large-4 column">
             <a href="{% url 'listwatch' %}" class="button small secondary">Back</a>
-            {% if form.attrs %}
-                {% include 'custom_crispy_templates/flat_form.html' %}
-            {% else %}
-                {{ form }}
-            {% endif %}
+            {% include 'custom_crispy_templates/flat_form.html' %}
         </div>
     </div>
 
diff --git a/python/nav/web/templates/maintenance/new_task.html b/python/nav/web/templates/maintenance/new_task.html
index a52be9eda0..526f99a876 100644
--- a/python/nav/web/templates/maintenance/new_task.html
+++ b/python/nav/web/templates/maintenance/new_task.html
@@ -35,11 +35,7 @@ <h4>{{ heading }}</h4>
         <div class="large-4 columns">
           <fieldset>
             <legend>Details</legend>
-            {% if task_form.attrs %}
-              {% include 'custom_crispy_templates/_form_content.html' with form=task_form %}
-            {% else %}
-              {{ task_form }}
-            {% endif %}
+            {% include 'custom_crispy_templates/_form_content.html' with form=task_form %}
           </fieldset>
         </div>
 
diff --git a/python/nav/web/templates/messages/save.html b/python/nav/web/templates/messages/save.html
index b189e34f4c..cee3f7f603 100644
--- a/python/nav/web/templates/messages/save.html
+++ b/python/nav/web/templates/messages/save.html
@@ -23,11 +23,7 @@ <h3>{{ caption }}</h3>
 
   <div class="row">
     <div class="column medium-6">
-      {% if form.attrs %}
-        {% include 'custom_crispy_templates/flat_form.html' %}
-      {% else %}
-        {{ form }}
-      {% endif %}
+      {% include 'custom_crispy_templates/flat_form.html' %}
     </div>
   </div>
 
diff --git a/python/nav/web/templates/navlets/alert_edit.html b/python/nav/web/templates/navlets/alert_edit.html
index d48f09112d..83f371a4ad 100644
--- a/python/nav/web/templates/navlets/alert_edit.html
+++ b/python/nav/web/templates/navlets/alert_edit.html
@@ -12,11 +12,7 @@
   </p>
 
   <form action="{% url 'get-user-navlet' navlet.navlet_id %}" method="post">
-    {% if form.attrs %}
-      {% include 'custom_crispy_templates/_form_content.html' %}
-    {% else %}
-      {{ form }}
-    {% endif %}
+    {% include 'custom_crispy_templates/_form_content.html' %}
     <input type="submit" class="button tiny" value="Save">
     <a class="button tiny secondary cancel-button">Cancel</a>
   </form>
diff --git a/python/nav/web/templates/portadmin/base.html b/python/nav/web/templates/portadmin/base.html
index c8a874fe8d..61bc610723 100644
--- a/python/nav/web/templates/portadmin/base.html
+++ b/python/nav/web/templates/portadmin/base.html
@@ -22,11 +22,7 @@
 
   {% block page_content %}
 
-    {% if form.attrs %}
-      {% include 'custom_crispy_templates/flat_form.html' %}
-    {% else %}
-      {{ form }}
-    {% endif %}
+    {% include 'custom_crispy_templates/flat_form.html' %}
 
     {% block content %}
       {% if form.is_bound %}
diff --git a/python/nav/web/templates/seeddb/netbox_wizard.html b/python/nav/web/templates/seeddb/netbox_wizard.html
index 0bd9befa99..81a671ac9e 100644
--- a/python/nav/web/templates/seeddb/netbox_wizard.html
+++ b/python/nav/web/templates/seeddb/netbox_wizard.html
@@ -40,11 +40,7 @@ <h4>{{ title }}</h4>
   </div>
 
   <form  id="seeddb-netbox-form" method="post">
-    {% if form.attrs %}
-      {% include 'seeddb/_seeddb_netbox_form_content.html' %}
-    {% else %}
-      {{ form }}
-    {% endif %}
+    {% include 'seeddb/_seeddb_netbox_form_content.html' %}
     <input type="submit" name="save_ip_device" value="Save IP device" class="submit button small left" id="submit-id-save_ip_device" />
   </form>
 
diff --git a/python/nav/web/templates/sortedstats/sortedstats.html b/python/nav/web/templates/sortedstats/sortedstats.html
index 9e11a21a0f..41c659b7a6 100644
--- a/python/nav/web/templates/sortedstats/sortedstats.html
+++ b/python/nav/web/templates/sortedstats/sortedstats.html
@@ -22,11 +22,7 @@
     </div>
   {% endif %}
 
-  {% if form.attrs %}
-    {% include 'custom_crispy_templates/flat_form.html' %}
-  {% else %}
-    {{ form }}
-  {% endif %}
+  {% include 'custom_crispy_templates/flat_form.html' %}
 
   {# Display view if exists #}
   {% if result %}
diff --git a/python/nav/web/templates/status2/status.html b/python/nav/web/templates/status2/status.html
index 4889622630..ad8aee57af 100644
--- a/python/nav/web/templates/status2/status.html
+++ b/python/nav/web/templates/status2/status.html
@@ -29,11 +29,7 @@
     {# Form for filtering events #}
     <a href="javascript:void(0);" class="button small secondary toggle-panel"></a>
     <div id="status-panel" class="hidden panel">
-      {% if form.attrs %}
-        {% include 'custom_crispy_templates/flat_form.html' %}
-      {% else %}
-        {{ form }}
-      {% endif %}
+      {% include 'custom_crispy_templates/flat_form.html' %}
     <hr>
       <a href="javascript:void(0);" class="button small secondary set-default">Save as my default status filter</a>
       <button id="clear-status-form" class="small secondary">Clear form</button>
diff --git a/python/nav/web/templates/threshold/set_threshold.html b/python/nav/web/templates/threshold/set_threshold.html
index d10a619c03..6e18a10e16 100644
--- a/python/nav/web/templates/threshold/set_threshold.html
+++ b/python/nav/web/templates/threshold/set_threshold.html
@@ -20,11 +20,7 @@ <h4>{{ heading }}</h4>
            data-url="{% url 'threshold-search' %}"
            data-renderurl="{% url 'threshold-graph' %}"
            data-metric="{{ metric|default_if_none:'' }}">
-        {% if form.attrs %}
-          {% include 'custom_crispy_templates/flat_form.html' %}
-        {% else %}
-          {{ form }}
-        {% endif %}
+        {% include 'custom_crispy_templates/flat_form.html' %}
       </div>
       {% if id %}
       <a href="#" data-dropdown="confirm-delete" class="button alert">Delete</a>
diff --git a/python/nav/web/templates/useradmin/group_detail.html b/python/nav/web/templates/useradmin/group_detail.html
index d161305e8b..c558056fb8 100644
--- a/python/nav/web/templates/useradmin/group_detail.html
+++ b/python/nav/web/templates/useradmin/group_detail.html
@@ -77,11 +77,7 @@ <h4>Create new group</h4>
             {% endif %}
 
             <h6>Add group member</h6>
-            {% if account_form.attrs %}
-              {% include 'custom_crispy_templates/flat_form.html' with form=account_form %}
-            {% else %}
-              {{ account_form }}
-            {% endif %}
+            {% include 'custom_crispy_templates/flat_form.html' with form=account_form %}
           </fieldset>
         </div>
         {# END GROUP MEMBERS #}
diff --git a/python/nav/web/templates/webfront/login.html b/python/nav/web/templates/webfront/login.html
index 7f73c90cca..fda2bda3aa 100644
--- a/python/nav/web/templates/webfront/login.html
+++ b/python/nav/web/templates/webfront/login.html
@@ -48,11 +48,7 @@
         </div>
       {% endif %}
 
-      {% if form.attrs %}
-        {% include 'custom_crispy_templates/flat_form.html' %}
-      {% else %}
-        {{ form }}
-      {% endif %}
+      {% include 'custom_crispy_templates/flat_form.html' %}
 
       <small>
         <a href="#" data-reveal-id="auditlog-information">About audit logging in NAV</a>
diff --git a/python/nav/web/templates/webfront/preferences.html b/python/nav/web/templates/webfront/preferences.html
index d81fb54d83..b4235332c8 100644
--- a/python/nav/web/templates/webfront/preferences.html
+++ b/python/nav/web/templates/webfront/preferences.html
@@ -61,11 +61,7 @@
         </div>
 
         <div class="column medium-6 large-7">
-            {% if columns_form.attrs %}
-                {% include 'custom_crispy_templates/flat_form.html' with form=columns_form %}
-            {% else %}
-                {{ columns_form }}
-            {% endif %}
+            {% include 'custom_crispy_templates/flat_form.html' with form=columns_form %}
         </div>
 
     </div>
@@ -79,11 +75,7 @@
         </p>
     {% else %}
         <form method="post" id="change-password-form" action="{% url 'webfront-preferences-changepassword' %}">
-          {% if password_form.attrs %}
-            {% include 'custom_crispy_templates/_form_content.html' with form=password_form %}
-          {% else %}
-            {{ password_form }}
-          {% endif %}
+          {% include 'custom_crispy_templates/_form_content.html' with form=password_form %}
         </form>
     {% endif %}