diff --git a/conntrackt/views.py b/conntrackt/views.py --- a/conntrackt/views.py +++ b/conntrackt/views.py @@ -712,8 +712,7 @@ class CommunicationCreateView(MultiplePe # Limit the interface selection based on provided source entity, # destination entity, or project. - entity_id = self.request.GET.get("from_entity", None) - entity_id = self.request.GET.get("to_entity", None) + entity_id = self.request.GET.get("from_entity", None) or self.request.GET.get("to_entity", None) project_id = self.request.GET.get("project", None) if project_id: @@ -766,11 +765,7 @@ class CommunicationCreateView(MultiplePe page. """ - entity_id = self.request.GET.get("from_entity", None) - entity_id = self.request.GET.get("to_entity", None) - - if entity_id is None: - entity_id = self.object.source.entity.pk + entity_id = self.request.GET.get("from_entity", None) or self.request.GET.get("to_entity", None) or self.object.source.entity.pk return reverse("entity", args=(entity_id,)) @@ -822,11 +817,7 @@ class CommunicationUpdateView(MultiplePe page. """ - entity_id = self.request.GET.get("from_entity", None) - entity_id = self.request.GET.get("to_entity", None) - - if entity_id is None: - entity_id = self.object.source.entity.pk + entity_id = self.request.GET.get("from_entity", None) or self.request.GET.get("to_entity", None) or self.object.source.entity.pk return reverse("entity", args=(entity_id,)) @@ -864,11 +855,7 @@ class CommunicationDeleteView(MultiplePe @TODO: Fix this once Django 1.6 comes out with fix from ticket 19044. """ - entity_id = self.request.GET.get("from_entity", None) - entity_id = self.request.GET.get("to_entity", None) - - if entity_id is None: - entity_id = self.get_object().source.entity.pk + 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,))