Forms in the create view

src/personalisation/forms.py

@@ -5,17 +5,42 @@ from django.conf import settings
 from django.utils.translation import ugettext as _
 from wagtail.wagtailcore.models import Page
 
-from personalisation.models import Segment
+from wagtail.wagtailadmin.forms import WagtailAdminModelForm
+
+from personalisation.models import (ReferralRule, Segment, TimeRule,
+                                    VisitCountRule)
 
 
 class SegmentForm(forms.ModelForm):
-    """
+    """Custom Segment form for the create view."""
-    Custom Segment form for the create view
-    """
     class Meta:
+        """Why does this need a docstring? I do not know."""
         model = Segment
         fields = (
             'name',
             'status',
         )
 
+class TimeRuleForm(WagtailAdminModelForm):
+    """Create a form for the time rule model."""
+    title = "Time"
+    description = "Choose a time segment in which the user visits the site."
+    class Meta:
+        model = TimeRule
+        fields = ['start_time', 'end_time']
+
+class ReferralRuleForm(WagtailAdminModelForm):
+    """Create a form for the referral rule model."""
+    title = "Referrer"
+    description = "Define a referring page, domain or query the user has to come from."
+    class Meta:
+        model = ReferralRule
+        fields = ['regex_string']
+
+class VisitCountRuleForm(WagtailAdminModelForm):
+    """Create a form for the visit count rule model."""
+    title = "Visit count"
+    description = "Choose the number of visits the user has to have made."
+    class Meta:
+        model = VisitCountRule
+        fields = ['operator', 'count']

src/personalisation/templates/modeladmin/personalisation/segment/create.html

@@ -7,18 +7,26 @@
         {% include "wagtailadmin/shared/header.html" with title=view.get_page_title subtitle=view.get_page_subtitle icon=view.header_icon tabbed=1 merged=1 %}
     {% endblock %}
 
-
-    {{ modal_content }}
-
     <form action="{% block form_action %}{{ view.create_url }}{% endblock %}" {% if is_multipart %} enctype="multipart/form-data"
         {% endif %} method="POST" novalidate>
         {% csrf_token %}
         
         {% block form %}
             {{ edit_handler.render_form_content }}
-        {% endblock %}
 
-        <ul class="objects">
+            {% for form in additional_forms %}
+            <li class="object">
+                <h2>
+                    <label for="{{ form.title }}">{{ form.title }}</label>
+                </h2>
+                <fieldset class="">
+                    <p>{{ form.description }}</p>
+                    <legend>{{ form.title }}</legend>
+                    {{ form }}
+                </fieldset>
+                </li>
+            {% endfor %}
+
             <li class="object">
                 <h2>
                     <label for="id_rules">Rules</label>
@@ -57,9 +65,8 @@
 
                     <h2>Your chosen rules</h2>
                 </fieldset>
-
             </li>
-        </ul>
+        {% endblock %}
 
         {% block footer %}
         <footer>

src/personalisation/templates/wagtailadmin/embeds/referral_rule.html

@@ -10,8 +10,14 @@
     </div>
 
     <div class="nice-padding">
-        <form>
+        <form class="embed-form" action="" method="POST" novalidate>
-            {{ form_fields }}
+            {% csrf_token %}
+            <ul class="fields">
+                {% for field in form %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                {% endfor %}
+                <li><button type="submit" class="button  button-longrunning"><span class="icon icon-spinner"></span><em>{% trans 'Insert' %}</em></button></li>
+            </ul>
         </form>
     </div>
 {% endblock %}

src/personalisation/templates/wagtailadmin/embeds/time_rule.html

@@ -10,8 +10,14 @@
     </div>
 
     <div class="nice-padding">
-        <form>
+        <form class="embed-form" action="" method="POST" novalidate>
-            {{ form_fields }}
+            {% csrf_token %}
+            <ul class="fields">
+                {% for field in form %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                {% endfor %}
+                <li><button type="submit" class="button  button-longrunning"><span class="icon icon-spinner"></span><em>{% trans 'Insert' %}</em></button></li>
+            </ul>
         </form>
     </div>
 {% endblock %}

src/personalisation/templates/wagtailadmin/embeds/visit_count_rule.html

@@ -10,8 +10,14 @@
     </div>
 
     <div class="nice-padding">
-        <form>
+        <form class="embed-form" action="" method="POST" novalidate>
-            {{ form_fields }}
+            {% csrf_token %}
+            <ul class="fields">
+                {% for field in form %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
+                {% endfor %}
+                <li><button type="submit" class="button  button-longrunning"><span class="icon icon-spinner"></span><em>{% trans 'Insert' %}</em></button></li>
+            </ul>
         </form>
     </div>
 {% endblock %}

src/personalisation/views.py

@@ -5,13 +5,12 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
-
 from wagtail.contrib.modeladmin.views import CreateView
 
-from personalisation.models import (
+from personalisation.forms import (ReferralRuleForm, SegmentForm, TimeRuleForm,
-    ReferralRule, Segment, TimeRule, VisitCountRule)
+                                   VisitCountRuleForm)
-from personalisation.models import Segment
+from personalisation.models import (ReferralRule, Segment, TimeRule,
-from personalisation.forms import SegmentForm
+                                    VisitCountRule)
 
 
 def overview(request):
@@ -37,40 +36,22 @@ def disable(request, segment_id):
 # TODO: Make these requestable from an exsisting page (the create page.)
 # This code might become obselete.
 
-class TimeRuleForm(ModelForm):
-    """Create a form for the time rule model."""
-    class Meta:
-        model = TimeRule
-        fields = ['start_time', 'end_time']
-
 def time_rule_embed(request):
     """Show the content of the time rule modal."""
     return render(request, 'wagtailadmin/embeds/time_rule.html', {
-        'form_fields': TimeRuleForm(),
+        'form': TimeRuleForm,
     })
 
-class ReferralRuleForm(ModelForm):
-    """Create a form for the referral rule model."""
-    class Meta:
-        model = ReferralRule
-        fields = ['regex_string']
-
 def referral_rule_embed(request):
     """Show the content of the referral rule modal."""
     return render(request, 'wagtailadmin/embeds/referral_rule.html', {
-        'form_fields': ReferralRuleForm,
+        'form': ReferralRuleForm,
     })
 
-class VisitCountRuleForm(ModelForm):
-    """Create a form for the visit count rule model."""
-    class Meta:
-        model = VisitCountRule
-        fields = ['operator', 'count']
-
 def visit_c_rule_embed(request):
     """Show the content of the visit count rule modal."""
     return render(request, 'wagtailadmin/embeds/visit_count_rule.html', {
-        'form_fields': VisitCountRule,
+        'form': VisitCountRuleForm,
     })
 
 class CreateSegmentView(CreateView):

src/personalisation/wagtail_hooks.py

@@ -2,9 +2,12 @@ import time
 
 from django.conf.urls import include, url
 from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
+from wagtail.contrib.modeladmin.views import CreateView
 from wagtail.wagtailcore import hooks
 
 from personalisation import admin_urls
+from personalisation.forms import (ReferralRuleForm, TimeRuleForm,
+                                   VisitCountRuleForm)
 from personalisation.models import Segment
 
 
@@ -18,6 +21,14 @@ def register_admin_urls():
             namespace='personalisation')),
     ]
 
+class SegmentCreateView(CreateView):
+    def get_context_data(self, **kwargs):
+        context = {
+            'additional_forms': (TimeRuleForm, ReferralRuleForm, VisitCountRuleForm),
+        }
+        context.update(kwargs)
+        return super(SegmentCreateView, self).get_context_data(**context)
+
 
 class SegmentModelAdmin(ModelAdmin):
     """The base model for the Segments administration interface."""
@@ -25,6 +36,7 @@ class SegmentModelAdmin(ModelAdmin):
     menu_icon = 'group'
     add_to_settings_menu = False
     list_display = ('status', 'name', 'create_date', 'edit_date')
+    create_view_class = SegmentCreateView
     index_view_extra_css = ['personalisation/segment/index.css']
     form_view_extra_css = ['personalisation/segment/form.css']
     inspect_view_enabled = True