diff --git a/conntrackt/templates/conntrackt/communication_update_form.html b/conntrackt/templates/conntrackt/communication_update_form.html deleted file mode 100644 --- a/conntrackt/templates/conntrackt/communication_update_form.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "conntrackt/base.html" %} - -{# For html_link #} -{% load conntrackt_tags %} -{# For Bootstrapped forms #} -{% load crispy_forms_tags %} - -{% block content %} -
-

Edit communication {{interface.name}}

-
-
-
-
-
- {% csrf_token %} - {{ form | crispy }} -
-
- -
-
-
-
-{% endblock content %} diff --git a/conntrackt/templates/conntrackt/entity_update_form.html b/conntrackt/templates/conntrackt/entity_update_form.html deleted file mode 100644 --- a/conntrackt/templates/conntrackt/entity_update_form.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "conntrackt/base.html" %} - -{# For html_link #} -{% load conntrackt_tags %} -{# For Bootstrapped forms #} -{% load crispy_forms_tags %} - -{% block content %} -
-

Edit entity {{entity.name}}

-
-
-
-
-
- {% csrf_token %} - {{ form | crispy }} -
-
- -
-
-
-
-{% endblock content %} diff --git a/conntrackt/templates/conntrackt/interface_update_form.html b/conntrackt/templates/conntrackt/interface_update_form.html deleted file mode 100644 --- a/conntrackt/templates/conntrackt/interface_update_form.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "conntrackt/base.html" %} - -{# For html_link #} -{% load conntrackt_tags %} -{# For Bootstrapped forms #} -{% load crispy_forms_tags %} - -{% block content %} -
-

Edit interface {{interface.name}}

-
-
-
-
-
- {% csrf_token %} - {{ form | crispy }} -
-
- -
-
-
-
-{% endblock content %} diff --git a/conntrackt/templates/conntrackt/location_update_form.html b/conntrackt/templates/conntrackt/location_update_form.html deleted file mode 100644 --- a/conntrackt/templates/conntrackt/location_update_form.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "conntrackt/base.html" %} - -{# For html_link #} -{% load conntrackt_tags %} -{# For Bootstrapped forms #} -{% load crispy_forms_tags %} - -{% block content %} -
-

Edit location {{location.name}}

-
-
-
-
-
- {% csrf_token %} - {{ form | crispy }} -
-
- -
-
-
-
-{% endblock content %} diff --git a/conntrackt/templates/conntrackt/project_update_form.html b/conntrackt/templates/conntrackt/project_update_form.html deleted file mode 100644 --- a/conntrackt/templates/conntrackt/project_update_form.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "conntrackt/base.html" %} - -{# For html_link #} -{% load conntrackt_tags %} -{# For Bootstrapped forms #} -{% load crispy_forms_tags %} - -{% block content %} -
-

Edit project {{project.name}}

-
-
-
-
-
- {% csrf_token %} - {{ form | crispy }} -
-
- -
-
-
-
-{% endblock content %} diff --git a/conntrackt/templates/conntrackt/update_form.html b/conntrackt/templates/conntrackt/update_form.html new file mode 100644 --- /dev/null +++ b/conntrackt/templates/conntrackt/update_form.html @@ -0,0 +1,25 @@ +{% extends "conntrackt/base.html" %} + +{# For html_link #} +{% load conntrackt_tags %} +{# For Bootstrapped forms #} +{% load crispy_forms_tags %} + +{% block content %} +
+

{{headline}}

+
+
+
+
+
+ {% csrf_token %} + {{ form | crispy }} +
+
+ +
+
+
+
+{% endblock content %} diff --git a/conntrackt/views.py b/conntrackt/views.py --- a/conntrackt/views.py +++ b/conntrackt/views.py @@ -266,14 +266,14 @@ class ProjectCreateView(SetHeadlineMixin 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 = { @@ -283,6 +283,13 @@ class ProjectUpdateView(MultiplePermissi # 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): """ @@ -333,14 +340,14 @@ class LocationCreateView(SetHeadlineMixi 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 = { @@ -352,6 +359,13 @@ class LocationUpdateView(MultiplePermiss 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): """ @@ -437,14 +451,14 @@ class EntityCreateView(SetHeadlineMixin, 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 = { @@ -454,6 +468,13 @@ class EntityUpdateView(MultiplePermissio # 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): """ @@ -552,14 +573,14 @@ class InterfaceCreateView(SetHeadlineMix 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 = { @@ -595,6 +616,13 @@ class InterfaceUpdateView(MultiplePermis 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): """ @@ -719,14 +747,14 @@ class CommunicationCreateView(SetHeadlin 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 = { @@ -766,6 +794,13 @@ class CommunicationUpdateView(MultiplePe 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): """