From da9a02170c54f04ac5d75d82442f6ab8074a4948 Mon Sep 17 00:00:00 2001
From: Will Barton <william.barton@cfpb.gov>
Date: Tue, 25 Feb 2020 13:20:52 -0500
Subject: [PATCH] Remove uneditable flag name field from conditions

This change hides the flag name field from condition creation and edit forms. The field was not editable by users, because the flag name is always provided.

The field had been rendering as blank, despite having the value filled in. This change moves it to a hidden field.
---
 wagtailflags/forms.py                         |  3 +-
 .../wagtailflags/flags/edit_condition.html    | 44 ++++++++++++-------
 wagtailflags/tests/test_views.py              |  2 +-
 wagtailflags/views.py                         |  3 +-
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/wagtailflags/forms.py b/wagtailflags/forms.py
index e6c138d..4b83c30 100644
--- a/wagtailflags/forms.py
+++ b/wagtailflags/forms.py
@@ -37,9 +37,10 @@ class FlagStateForm(forms.ModelForm):
         label='Flag',
         required=True,
         disabled=True,
+        widget=forms.HiddenInput(),
     )
     condition = forms.ChoiceField(
-        label='Condition name',
+        label='Condition',
         required=True
     )
     value = forms.CharField(
diff --git a/wagtailflags/templates/wagtailflags/flags/edit_condition.html b/wagtailflags/templates/wagtailflags/flags/edit_condition.html
index 240ec19..ab6219c 100644
--- a/wagtailflags/templates/wagtailflags/flags/edit_condition.html
+++ b/wagtailflags/templates/wagtailflags/flags/edit_condition.html
@@ -1,6 +1,6 @@
 {% extends "wagtailadmin/base.html" %}
 {% load i18n feature_flags %}
-{% block titletag %}{% if form.instance %}Edit {{ form.instance.condition }}{% else %}Create condition{% endif %}{% endblock %}
+{% block titletag %}{% if form.instance %}Edit {{ form.instance.condition }} condition{% else %}Create condition{% endif %}{% endblock %}
 
 {% block content %}
     {% include "wagtailadmin/shared/header.html" with title=flag.name icon="tag" %}
@@ -18,23 +18,35 @@ <h2 class="nice-padding">
     {% endif %}
         {% csrf_token %}
         <ul class="fields">
-            <li class="actions">
-                {% for field in form %}
-                    {% if field.errors %}
-                        <div class="help-block help-critical" style="margin-top:0;">
-                            {{ field.errors }}
+
+            {% for field in form %}
+            <li {% if field.field.required %}class="required"{% endif %}>
+                    {% if not field.is_hidden %}
+                        <div class="field">
+                            {{ field.label_tag }}
+
+                            <div class="field-content">
+                                <div class="input">
+                                    {{ field }}
+                                </div>
+                                {% if field.help_text %}
+                                    <p class="help">{{ field.help_text|safe }}</p>
+                                {% endif %}
+                            </div>
+
+                            {% if field.errors %}
+                                <div class="help-block help-critical" style="margin-top:0;">
+                                    {{ field.errors }}
+                                </div>
+                            {% endif %}
                         </div>
+                    {% else %}
+                        {{ field }}
                     {% endif %}
-                    <label>{{ field.label }}</label>
-                    <div class="field-content">
-                        <div class="input">
-                            {{ field }}
-                            <span></span>
-                        </div>
-                        <p class="help"></p>
-                    </div>
-                {% endfor %}
-            </li>
+
+                </li>
+            {% endfor %}
+
             <li class="actions">
                 <input class="button action-save button-longrunning" type="submit" value="Save condition" />
                 <a class="button bicolor icon icon-cog" href="{% url 'wagtailflags:flag_index' flag.name %}">Back to {{ flag.name }}</a>
diff --git a/wagtailflags/tests/test_views.py b/wagtailflags/tests/test_views.py
index c39522f..892cb71 100644
--- a/wagtailflags/tests/test_views.py
+++ b/wagtailflags/tests/test_views.py
@@ -1,4 +1,4 @@
-from django.test import TestCase, override_settings
+from django.test import TestCase
 
 from wagtail.tests.utils import WagtailTestUtils
 
diff --git a/wagtailflags/views.py b/wagtailflags/views.py
index 0a5742e..589a563 100644
--- a/wagtailflags/views.py
+++ b/wagtailflags/views.py
@@ -1,9 +1,8 @@
 from django.http import Http404
-from django.shortcuts import get_object_or_404, redirect, render, resolve_url
+from django.shortcuts import get_object_or_404, redirect, render
 
 from flags.models import FlagState
 from flags.sources import get_flags
-from flags.state import flag_enabled
 from flags.templatetags.flags_debug import bool_enabled
 from wagtailflags.forms import FlagStateForm, NewFlagForm