conntrackt Changeset - 4d15241bfa82

Changeset - 4d15241bfa82

Parent rev.

Child rev.

[Not reviewed]

default

5 1 1

Branko Majic (branko) - 12 years ago 2013-07-25 20:02:43
branko@majic.rs

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

7 files changed with 79 insertions and 140 deletions:

conntrackt/templates/conntrackt/communication_confirm_delete.html

conntrackt/templates/conntrackt/delete_form.html

conntrackt/templates/conntrackt/entity_confirm_delete.html

conntrackt/templates/conntrackt/interface_confirm_delete.html

conntrackt/templates/conntrackt/location_confirm_delete.html

conntrackt/templates/conntrackt/project_confirm_delete.html

conntrackt/views.py

0 comments (0 inline, 0 general)

conntrackt/templates/conntrackt/communication_confirm_delete.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/delete_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="span12">
     <form action="" method="post">
       <div class="controls controls-row">
         {% csrf_token %}
         {{ form }}
         Are you sure you want to remove this project?
       </div>
       <hr>
       <div class="controls">
         <button type="submit" class="btn btn-primary">Remove</button>
       </div>
     </form>
   </div>
 </div>
 {% endblock content %}

conntrackt/templates/conntrackt/entity_confirm_delete.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/interface_confirm_delete.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/location_confirm_delete.html

➞

Show inline comments

deleted file

conntrackt/templates/conntrackt/project_confirm_delete.html

➞

Show inline comments

deleted file

conntrackt/views.py

➞

Show inline comments

@@ @@ -288,18 +288,19 @@ class ProjectUpdateView(SetHeadlineMixin @@
         Set headline based on project name.
         """
         return "Update project %s" % self.object.name
 class ProjectDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
+class ProjectDeleteView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting a project.
     """
     model = Project
     template_name = "conntrackt/delete_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.delete_project",),
+        }
@@ @@ -315,12 +316,19 @@ class ProjectDeleteView(MultiplePermissi @@
         """
         messages.success(self.request, "Project %s has been removed." % self.get_object().name, extra_tags="alert alert-success")
         return super(ProjectDeleteView, self).post(*args, **kwargs)
     def get_headline(self):
         """
         Set headline based on project name.
         """
         return "Delete project %s" % self.object.name
 class LocationCreateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, CreateView):
     """
     View for creating a new location.
     """
@@ @@ -364,18 +372,19 @@ class LocationUpdateView(SetHeadlineMixi @@
         Set headline based on location name.
         """
         return "Update location %s" % self.object.name
 class LocationDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
+class LocationDeleteView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting a location.
     """
     model = Location
     template_name = "conntrackt/delete_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.delete_location",),
+        }
@@ @@ -391,12 +400,19 @@ class LocationDeleteView(MultiplePermiss @@
         """
         messages.success(self.request, "Location %s has been removed." % self.get_object().name, extra_tags="alert alert-success")
         return super(LocationDeleteView, self).post(*args, **kwargs)
     def get_headline(self):
         """
         Set headline based on location name.
         """
         return "Delete location %s" % self.object.name
 class EntityCreateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, CreateView):
     """
     View for creating a new entity.
     """
@@ @@ -473,18 +489,19 @@ class EntityUpdateView(SetHeadlineMixin, @@
         Set headline based on entity name.
         """
         return "Update entity %s" % self.object.name
 class EntityDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
+class EntityDeleteView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting an entity.
     """
     model = Entity
     template_name = "conntrackt/delete_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.delete_entity",),
+        }
@@ @@ -510,12 +527,19 @@ class EntityDeleteView(MultiplePermissio @@
         """
         self.success_url = reverse("project", args=(self.get_object().project.id,))
         return super(EntityDeleteView, self).delete(*args, **kwargs)
     def get_headline(self):
         """
         Set headline based on entity name.
         """
         return "Delete entity %s" % self.object.name
 class InterfaceCreateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, CreateView):
     """
     View for creating a new interface.
     """
@@ @@ -621,18 +645,19 @@ class InterfaceUpdateView(SetHeadlineMix @@
         Set headline based on interface name.
         """
         return "Update interface %s" % self.object.name
 class InterfaceDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
+class InterfaceDeleteView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting an interface.
     """
     model = Interface
     template_name = "conntrackt/delete_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.delete_interface",),
+        }
@@ @@ -658,12 +683,19 @@ class InterfaceDeleteView(MultiplePermis @@
         """
         self.success_url = reverse("entity", args=(self.get_object().entity.id,))
         return super(InterfaceDeleteView, self).delete(*args, **kwargs)
     def get_headline(self):
         """
         Set headline based on interface name.
         """
         return "Delete interface %s" % self.object.name
 class CommunicationCreateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, CreateView):
     """
     View for creating a new communication.
     """
@@ @@ -743,12 +775,19 @@ class CommunicationCreateView(SetHeadlin @@
         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 interface name.
         """
         return "Delete interface %s" % self.object.name
 class CommunicationUpdateView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, UpdateView):
     """
     View for updating an existing communication.
     """
@@ @@ -799,18 +838,19 @@ class CommunicationUpdateView(SetHeadlin @@
         Set headline based on communication.
         """
         return "Update communication %s" % self.object
 class CommunicationDeleteView(MultiplePermissionsRequiredMixin, DeleteView):
+class CommunicationDeleteView(SetHeadlineMixin, MultiplePermissionsRequiredMixin, DeleteView):
     """
     View for deleting an communication.
     """
     model = Communication
     template_name = "conntrackt/delete_form.html"
     # Required permissions.
     permissions = {
         "all": ("conntrackt.delete_communication",),
+        }
@@ @@ -837,6 +877,13 @@ class CommunicationDeleteView(MultiplePe @@
         entity_id = self.request.GET.get("from_entity", None) or self.request.GET.get("to_entity", None) or self.get_object().source.entity.pk
         self.success_url = reverse("entity", args=(entity_id,))
         return super(CommunicationDeleteView, self).delete(*args, **kwargs)
     def get_headline(self):
         """
         Set headline based on communication.
         """
         return "Delete communication %s" % self.object

0 comments (0 inline, 0 general)