diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2014-05-12 21:21:04 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2014-05-12 21:23:12 +0200 |
commit | 18a6ad99164350af62d65efd6a1fd1aa4c419739 (patch) | |
tree | e69bfd5b3bc0843ec93223dc12d4a376d6b489c0 /archaeological_files/models.py | |
parent | 6d05b2d357c15b9d291922ac67fecebe3208b55f (diff) | |
download | Ishtar-18a6ad99164350af62d65efd6a1fd1aa4c419739.tar.bz2 Ishtar-18a6ad99164350af62d65efd6a1fd1aa4c419739.zip |
Person and organization deletion (refs #1675)
* add associated actions, wizards, forms
* prevent deletion of associted items (operations, files, etc.)
* give list of associated items before deletion and give access to these
items
Diffstat (limited to 'archaeological_files/models.py')
-rw-r--r-- | archaeological_files/models.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 5138731d5..297a23fed 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -73,12 +73,17 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter): file_type = models.ForeignKey(FileType, verbose_name=_(u"File type")) in_charge = models.ForeignKey(Person, related_name='file_responsability', verbose_name=_(u"Person in charge"), - blank=True, null=True) - general_contractor = models.ForeignKey(Person, related_name='+', - verbose_name=_(u"General contractor"), blank=True, null=True) + on_delete=models.SET_NULL, + blank=True, null=True) + general_contractor = models.ForeignKey(Person, + related_name='general_contractor', + verbose_name=_(u"General contractor"), blank=True, null=True, + on_delete=models.SET_NULL,) responsible_town_planning_service = models.ForeignKey(Person, - related_name='+', blank=True, null=True, - verbose_name=_(u"Responsible for town planning service")) + related_name='responsible_town_planning_service', + blank=True, null=True, + verbose_name=_(u"Responsible for town planning service"), + on_delete=models.SET_NULL,) permit_type = models.ForeignKey(PermitType, verbose_name=_(u"Permit type"), blank=True, null=True) permit_reference = models.CharField(_(u"Permit reference"), @@ -116,9 +121,11 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter): related_name='+', null=True, blank=True, verbose_name=_(u"Requested operation type")) organization = models.ForeignKey(Organization, blank=True, null=True, - verbose_name=_(u"Organization")) + verbose_name=_(u"Organization"), + related_name='files', + on_delete=models.SET_NULL) scientist = models.ForeignKey(Person, blank=True, null=True, - related_name='+', + related_name='scientist', on_delete=models.SET_NULL, verbose_name=_(u"Scientist in charge")) research_comment = models.TextField(_(u"Research archaeology comment"), null=True, blank=True) |