diff --git a/adm/templatetags/__pycache__/__init__.cpython-38.pyc b/adm/templatetags/__pycache__/__init__.cpython-38.pyc index b23f1ad..7f30257 100644 Binary files a/adm/templatetags/__pycache__/__init__.cpython-38.pyc and b/adm/templatetags/__pycache__/__init__.cpython-38.pyc differ diff --git a/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc b/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc index 95ab77e..b1b062a 100644 Binary files a/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc and b/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc differ diff --git a/recoverdir/views.py b/recoverdir/views.py index 93ab0a6..1b3831d 100644 --- a/recoverdir/views.py +++ b/recoverdir/views.py @@ -465,7 +465,7 @@ class RecoverDirAddPL(CreateView): template_name = "recoverdir/rd_pers_add.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -489,7 +489,7 @@ class RecoverDirUpdatePL(UpdateView): template_name = "recoverdir/rd_pers_update.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -513,7 +513,7 @@ class RDAoneAddDoc(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -544,7 +544,7 @@ class RDAoneViewDoc(DetailView): context_object_name = 'document' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -556,7 +556,7 @@ class RDAoneDelDoc(DeleteView): context_object_name = 'document' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -573,7 +573,7 @@ class RDAoneUpdateDoc(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -625,7 +625,7 @@ class RDAoneUpdateHL(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addhl.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -643,7 +643,7 @@ class RDAoneAddFC(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -664,7 +664,7 @@ class RDAoneUpdateContact(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -681,7 +681,7 @@ class RDAoneViewContact(DetailView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -693,7 +693,7 @@ class RDAoneDelContact(DeleteView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -711,7 +711,7 @@ class RDAoneViewTrust(DetailView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -723,7 +723,7 @@ class RDAoneDelTrust(DeleteView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -740,7 +740,7 @@ class RDAoneAddTrust(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -761,7 +761,7 @@ class RDAoneUpdateTrust(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -780,7 +780,7 @@ class RDAtwoAddHLFV(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -801,7 +801,7 @@ class RDAtwoUpdateFV(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -819,7 +819,7 @@ class RDAtwoViewdeposit(DetailView): context_object_name = 'deposit' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -831,7 +831,7 @@ class RDAtwoDeldeposit(DeleteView): context_object_name = 'deposit' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -848,7 +848,7 @@ class RDAtwoAdddeposit(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_adddeposit.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -877,7 +877,7 @@ class RDAtwoUpdatedeposit(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_adddeposit.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -899,7 +899,7 @@ class RDAtwoViewergo(DetailView): context_object_name = 'ergo' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -911,7 +911,7 @@ class RDAtwoDelergo(DeleteView): context_object_name = 'ergo' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -928,7 +928,7 @@ class RDAtwoAddergo(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addergo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -949,7 +949,7 @@ class RDAtwoUpdateergo(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addergo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -971,7 +971,7 @@ class RDAtwoViewonlinebank(DetailView): context_object_name = 'onlinebank' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -983,7 +983,7 @@ class RDAtwoDelonlinebank(DeleteView): context_object_name = 'onlinebank' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1000,7 +1000,7 @@ class RDAtwoAddonlinebank(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addonlinebank.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1030,7 +1030,7 @@ class RDAtwoUpdateonlinebank(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addonlinebank.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1059,7 +1059,7 @@ class RDAthreeViewstreaming(DetailView): context_object_name = 'streaming' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1071,7 +1071,7 @@ class RDAthreeDelstreaming(DeleteView): context_object_name = 'streaming' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1088,7 +1088,7 @@ class RDAthreeAddstreaming(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_3_addstreamingabo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1117,7 +1117,7 @@ class RDAthreeUpdatestreaming(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_3_addstreamingabo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1146,7 +1146,7 @@ class RDAfourViewdigitalaccount(DetailView): context_object_name = 'account' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1159,7 +1159,7 @@ class RDAfourDeldigitalaccount(DeleteView): def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1176,7 +1176,7 @@ class RDAfourAdddigitalaccount(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1206,7 +1206,7 @@ class RDAfourUpdatedigitalaccount(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1235,7 +1235,7 @@ class RDAfiveViewpersonal(DetailView): context_object_name = 'personal' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1247,7 +1247,7 @@ class RDAfiveDelpersonal(DeleteView): context_object_name = 'personal' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1264,7 +1264,7 @@ class RDAfiveAddpersonal(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_5_addpersonal.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1286,7 +1286,7 @@ class RDAfiveUpdatepersonal(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_5_addpersonal.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1308,7 +1308,7 @@ class RDAnineViewelse(DetailView): context_object_name = 'else' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1320,7 +1320,7 @@ class RDAnineDelelse(DeleteView): context_object_name = 'ele' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1337,7 +1337,7 @@ class RDAnineAddelse(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_9_addelse.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1359,7 +1359,7 @@ class RDAnineUpdateelse(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_9_addelse.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1381,7 +1381,7 @@ class RDAsevenViewcontract(DetailView): context_object_name = 'contract' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1393,7 +1393,7 @@ class RDAsevenDelcontract(DeleteView): context_object_name = 'ele' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1410,7 +1410,7 @@ class RDAsevenAddcontract(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_7_addcontract.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1431,7 +1431,7 @@ class RDAsevenUpdatecontract(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_7_addcontract.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1454,7 +1454,7 @@ class PLSingleHistory(DetailView): context_object_name = 'persletter' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1481,7 +1481,7 @@ class HLSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_1_hl_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1510,7 +1510,7 @@ class HLVFSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_hl_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1539,7 +1539,7 @@ class ContactSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1568,7 +1568,7 @@ class TrustSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_1_trust_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1597,7 +1597,7 @@ class DepositSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_deposit_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1626,7 +1626,7 @@ class DocumentSingleHistory(DetailView): template_name = 'recoverdir/rd_doc_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1655,7 +1655,7 @@ class ErgoSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_ergo_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1684,7 +1684,7 @@ class OnlinebankSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_onlinebank_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1713,7 +1713,7 @@ class StreamingSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_3_streamingabo_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1742,7 +1742,7 @@ class DigitalAccountSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1771,7 +1771,7 @@ class PersonalSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_5_personal_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1800,7 +1800,7 @@ class ContractSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_7_contract_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1829,7 +1829,7 @@ class ElseSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_9_else_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') diff --git a/standards/templatetags/__pycache__/__init__.cpython-38.pyc b/standards/templatetags/__pycache__/__init__.cpython-38.pyc index 028f00d..58f7f4f 100644 Binary files a/standards/templatetags/__pycache__/__init__.cpython-38.pyc and b/standards/templatetags/__pycache__/__init__.cpython-38.pyc differ diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 46b948e..b818287 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ