aboutsummaryrefslogtreecommitdiffstats
path: root/ctrack/organisations/views.py
diff options
context:
space:
mode:
authorMatthew Lemon <lemon@matthewlemon.com>2020-05-25 16:09:41 +0100
committerMatthew Lemon <lemon@matthewlemon.com>2020-05-25 16:09:41 +0100
commit75cad4697874dc1e06f1758dd9915394f7287d63 (patch)
treedb1d5e7a87f19d92bac5019c898fbc75cca418ba /ctrack/organisations/views.py
parent4aaa68109434e04d1103710d675efd075b2f744a (diff)
in trying to create a Stakeholder model referenced from User, have removed updated_by fields in other models and factories - was getting circular dep error
Diffstat (limited to 'ctrack/organisations/views.py')
-rw-r--r--ctrack/organisations/views.py23
1 files changed, 11 insertions, 12 deletions
diff --git a/ctrack/organisations/views.py b/ctrack/organisations/views.py
index fe88728..2476453 100644
--- a/ctrack/organisations/views.py
+++ b/ctrack/organisations/views.py
@@ -1,12 +1,11 @@
-from typing import Any
-from typing import Dict
+from typing import Any, Dict
from django.contrib.auth.mixins import LoginRequiredMixin
from django.db import transaction
from django.urls import reverse_lazy
-from django.views.generic import DetailView, ListView, CreateView
+from django.views.generic import CreateView, DetailView, ListView
-from .forms import OrganisationCreateForm, AddressInlineFormSet
+from .forms import AddressInlineFormSet, OrganisationCreateForm
from .models import Organisation
@@ -27,7 +26,7 @@ class OrganisationCreate(LoginRequiredMixin, CreateView):
context = self.get_context_data()
addresses = context["addresses"]
with transaction.atomic():
- form.instance.updated_by = self.request.user
+ # form.instance.updated_by = self.request.user REMOVED updated_by
self.object = form.save()
if addresses.is_valid():
addresses.instance = self.object
@@ -52,18 +51,18 @@ class OrganisationDetailView(LoginRequiredMixin, DetailView):
def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
context = super().get_context_data()
- org = kwargs['object']
+ org = kwargs["object"]
no_addr = org.addresses.count()
if no_addr > 1:
- context['no_addr'] = no_addr
+ context["no_addr"] = no_addr
addr = org.addresses.all()
- context['addr'] = addr
+ context["addr"] = addr
else:
- context['no_addr'] = 1
+ context["no_addr"] = 1
addr = org.addresses.first()
- context['addr'] = addr
+ context["addr"] = addr
people = org.person_set.all()
- context['people'] = people
+ context["people"] = people
applicable_systems = org.applicablesystem_set.all()
- context['applicable_systems'] = applicable_systems
+ context["applicable_systems"] = applicable_systems
return context