conntrackt Changeset - c2088143f5ff

Changeset - c2088143f5ff

Parent rev.

Child rev.

[Not reviewed]

default

5 1 1

Branko Majic (branko) - 11 years ago 2013-07-25 19:53:43
branko@majic.rs

CONNT-15: Reduced repetition for the update form by using a mixin and single template.

7 files changed with 70 insertions and 135 deletions:

conntrackt/templates/conntrackt/communication_update_form.html

conntrackt/templates/conntrackt/entity_update_form.html

conntrackt/templates/conntrackt/interface_update_form.html

conntrackt/templates/conntrackt/location_update_form.html

conntrackt/templates/conntrackt/project_update_form.html

conntrackt/templates/conntrackt/update_form.html

conntrackt/views.py

0 comments (0 inline, 0 general)

conntrackt/templates/conntrackt/communication_update_form.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/entity_update_form.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/interface_update_form.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/location_update_form.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/project_update_form.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/update_form.html

➞

Show inline comments

@@ new file 100644 @@
 {% extends "conntrackt/base.html" %}
 {# For html_link #}
 {% load conntrackt_tags %}
 {# For Bootstrapped forms #}
 {% load crispy_forms_tags %}
 {% block content %}
 <div class="row">
   <h1 class="span12">{{headline}}</h1>
 </div>
 <div class="row">
   <div class="span6">
     <form action="" method="post">
       <div class="controls controls-row">
       {% csrf_token %}
       {{ form | crispy }}
       </div>
       <div class="controls">
         <button type="submit" class="btn btn-primary">Update</button>
       </div>
     </form>
   </div>
 </div>
 {% endblock content %}

conntrackt/views.py

➞

Show inline comments

@@ @@ -263,29 +263,36 @@ class ProjectCreateView(SetHeadlineMixin @@
+        }
     # Raise authorisation denied exception for unmet permissions.
     raise_exception = True
 class ProjectUpdateView(MultiplePermissionsRequiredMixin, UpdateView):
+class ProjectUpdateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, UpdateView):
     """
     View for modifying an existing project.
     """
     model = Project
     form_class = ProjectForm
-    template_name_suffix = "_update_form"
+    template_name = "conntrackt/update_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.change_project",),
+        }
     # Raise authorisation denied exception for unmet permissions.
     raise_exception = True
     def get_headline(self):
         """
         Set headline based on project name.
         """
         return "Update project %s" % self.object.name
 class ProjectDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting a project.
     """
@@ @@ -330,31 +337,38 @@ class LocationCreateView(SetHeadlineMixi @@
     # Raise authorisation denied exception for unmet permissions.
     raise_exception = True
     success_url = reverse_lazy("index")
 class LocationUpdateView(MultiplePermissionsRequiredMixin, UpdateView):
+class LocationUpdateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, UpdateView):
     """
     View for modifying an existing location.
     """
     model = Location
     form_class = LocationForm
-    template_name_suffix = "_update_form"
+    template_name = "conntrackt/update_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.change_location",),
+        }
     # Raise authorisation denied exception for unmet permissions.
     raise_exception = True
     success_url = reverse_lazy("index")
     def get_headline(self):
         """
         Set headline based on location name.
         """
         return "Update location %s" % self.object.name
 class LocationDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting a location.
     """
@@ @@ -434,29 +448,36 @@ class EntityCreateView(SetHeadlineMixin, @@
         initial["project"] = self.request.GET.get("project", None)
         initial["location"] = self.request.GET.get("location", None)
         return initial
 class EntityUpdateView(MultiplePermissionsRequiredMixin, UpdateView):
+class EntityUpdateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, UpdateView):
     """
     View for updating an existing entity.
     """
     model = Entity
     form_class = EntityForm
-    template_name_suffix = "_update_form"
+    template_name = "conntrackt/update_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.change_entity",),
+        }
     # Raise authorisation denied exception for unmet permissions.
     raise_exception = True
     def get_headline(self):
         """
         Set headline based on entity name.
         """
         return "Update entity %s" % self.object.name
 class EntityDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting an entity.
     """
@@ @@ -549,20 +570,20 @@ class InterfaceCreateView(SetHeadlineMix @@
         The URL in this case will be set to entity's details page.
         """
         return reverse("entity", args=(self.object.entity.pk,))
 class InterfaceUpdateView(MultiplePermissionsRequiredMixin, UpdateView):
+class InterfaceUpdateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, UpdateView):
     """
     View for updating an existing interface.
     """
     model = Interface
     form_class = InterfaceForm
-    template_name_suffix = "_update_form"
+    template_name = "conntrackt/update_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.change_interface",),
+        }
@@ @@ -592,12 +613,19 @@ class InterfaceUpdateView(MultiplePermis @@
         The URL in this case will be set to entity's details page.
         """
         return reverse("entity", args=(self.object.entity.pk,))
     def get_headline(self):
         """
         Set headline based on interface name.
         """
         return "Update interface %s" % self.object.name
 class InterfaceDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting an interface.
     """
@@ @@ -716,20 +744,20 @@ class CommunicationCreateView(SetHeadlin @@
         to project page to which the communication belongs.
         """
         return self.request.GET.get("next", reverse("project", args=(self.object.source.entity.project.pk,)))
 class CommunicationUpdateView(MultiplePermissionsRequiredMixin, UpdateView):
+class CommunicationUpdateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, UpdateView):
     """
     View for updating an existing communication.
     """
     model = Communication
     form_class = CommunicationForm
-    template_name_suffix = "_update_form"
+    template_name = "conntrackt/update_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.change_communication",),
+        }
@@ @@ -763,12 +791,19 @@ class CommunicationUpdateView(MultiplePe @@
         The URL will either point to value provided via GET parameter "next", or
         to project page to which the communication belongs.
         """
         return self.request.GET.get("next", reverse("project", args=(self.object.source.entity.project.pk,)))
     def get_headline(self):
         """
         Set headline based on communication.
         """
         return "Update communication %s" % self.object
 class CommunicationDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting an communication.
     """

0 comments (0 inline, 0 general)