diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-02-13 08:32:05 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-02-13 08:32:05 +0100 |
commit | 1a956579f10aeb0ce8ff37a76525881da7ee2277 (patch) | |
tree | 88f2c43c659d45c8e364cf45900e5bb40905c651 | |
parent | f382763bfe106abca8bad5a986afd15703f84d19 (diff) | |
download | Ishtar-1a956579f10aeb0ce8ff37a76525881da7ee2277.tar.bz2 Ishtar-1a956579f10aeb0ce8ff37a76525881da7ee2277.zip |
Add closing rights (refs #1628)
-rw-r--r-- | archaeological_files/ishtar_menu.py | 4 | ||||
-rw-r--r-- | archaeological_files/models.py | 1 | ||||
-rw-r--r-- | archaeological_operations/ishtar_menu.py | 4 | ||||
-rw-r--r-- | archaeological_operations/models.py | 1 | ||||
-rw-r--r-- | ishtar_common/fixtures/groups_person_types-SRA-fr.json | 2434 | ||||
-rw-r--r-- | ishtar_common/views.py | 4 |
6 files changed, 2426 insertions, 22 deletions
diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py index 87958848a..be6c0ff5f 100644 --- a/archaeological_files/ishtar_menu.py +++ b/archaeological_files/ishtar_menu.py @@ -40,9 +40,7 @@ MENU_SECTIONS = [ access_controls=['change_file', 'change_own_file']), MenuItem('file_closing', _(u"Closing"), model=models.File, - access_controls=['sra_agent']), - #'change_file', - #'change_own_file']), + access_controls=['close_file']), MenuItem('file_deletion', _(u"Deletion"), model=models.File, access_controls=['delete_file', 'delete_own_file']), diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 293608f0c..dd8db7a6e 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -120,6 +120,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter): ("add_own_file", ugettext(u"Can add own Archaelogical file")), ("change_own_file", ugettext(u"Can change own Archaelogical file")), ("delete_own_file", ugettext(u"Can delete own Archaelogical file")), + ("close_file", ugettext(u"Can close File")), ) ordering = ['-year', '-numeric_reference'] diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py index 5fa3ab433..143d77f05 100644 --- a/archaeological_operations/ishtar_menu.py +++ b/archaeological_operations/ishtar_menu.py @@ -40,9 +40,7 @@ MENU_SECTIONS = [ 'change_own_operation']), MenuItem('operation_closing', _(u"Closing"), model=models.Operation, - access_controls=['sra_agent']), - #'change_operation', - #'change_own_operation']), + access_controls=['close_operation']), MenuItem('operation_deletion', _(u"Deletion"), model=models.Operation, access_controls=['change_operation', diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 82567842f..c23bda9df 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -177,6 +177,7 @@ class Operation(BaseHistorizedItem, OwnPerms): ("add_own_operation", ugettext(u"Can add own Operation")), ("change_own_operation", ugettext(u"Can change own Operation")), ("delete_own_operation", ugettext(u"Can delete own Operation")), + ("close_operation", ugettext(u"Can close Operation")), ) def __unicode__(self): diff --git a/ishtar_common/fixtures/groups_person_types-SRA-fr.json b/ishtar_common/fixtures/groups_person_types-SRA-fr.json index 1f60d131f..ca7e5b5e1 100644 --- a/ishtar_common/fixtures/groups_person_types-SRA-fr.json +++ b/ishtar_common/fixtures/groups_person_types-SRA-fr.json @@ -1,5 +1,2381 @@ [ { + "pk": 10, + "model": "auth.permission", + "fields": { + "codename": "add_logentry", + "name": "Can add log entry", + "content_type": 4 + } + }, + { + "pk": 11, + "model": "auth.permission", + "fields": { + "codename": "change_logentry", + "name": "Can change log entry", + "content_type": 4 + } + }, + { + "pk": 12, + "model": "auth.permission", + "fields": { + "codename": "delete_logentry", + "name": "Can delete log entry", + "content_type": 4 + } + }, + { + "pk": 160, + "model": "auth.permission", + "fields": { + "codename": "add_activitytype", + "name": "Can add Type Activity", + "content_type": 47 + } + }, + { + "pk": 161, + "model": "auth.permission", + "fields": { + "codename": "change_activitytype", + "name": "Can change Type Activity", + "content_type": 47 + } + }, + { + "pk": 162, + "model": "auth.permission", + "fields": { + "codename": "delete_activitytype", + "name": "Can delete Type Activity", + "content_type": 47 + } + }, + { + "pk": 169, + "model": "auth.permission", + "fields": { + "codename": "add_contextrecord", + "name": "Can add Context Record", + "content_type": 50 + } + }, + { + "pk": 173, + "model": "auth.permission", + "fields": { + "codename": "add_own_contextrecord", + "name": "Can add own Context Record", + "content_type": 50 + } + }, + { + "pk": 170, + "model": "auth.permission", + "fields": { + "codename": "change_contextrecord", + "name": "Can change Context Record", + "content_type": 50 + } + }, + { + "pk": 174, + "model": "auth.permission", + "fields": { + "codename": "change_own_contextrecord", + "name": "Can change own Context Record", + "content_type": 50 + } + }, + { + "pk": 171, + "model": "auth.permission", + "fields": { + "codename": "delete_contextrecord", + "name": "Can delete Context Record", + "content_type": 50 + } + }, + { + "pk": 175, + "model": "auth.permission", + "fields": { + "codename": "delete_own_contextrecord", + "name": "Can delete own Context Record", + "content_type": 50 + } + }, + { + "pk": 243, + "model": "auth.permission", + "fields": { + "codename": "view_contextrecord", + "name": "Can view all Context Record", + "content_type": 50 + } + }, + { + "pk": 172, + "model": "auth.permission", + "fields": { + "codename": "view_own_contextrecord", + "name": "Can view own Context Record", + "content_type": 50 + } + }, + { + "pk": 176, + "model": "auth.permission", + "fields": { + "codename": "add_contextrecordsource", + "name": "Can add Context record documentation", + "content_type": 51 + } + }, + { + "pk": 177, + "model": "auth.permission", + "fields": { + "codename": "change_contextrecordsource", + "name": "Can change Context record documentation", + "content_type": 51 + } + }, + { + "pk": 178, + "model": "auth.permission", + "fields": { + "codename": "delete_contextrecordsource", + "name": "Can delete Context record documentation", + "content_type": 51 + } + }, + { + "pk": 154, + "model": "auth.permission", + "fields": { + "codename": "add_dating", + "name": "Can add Dating", + "content_type": 45 + } + }, + { + "pk": 155, + "model": "auth.permission", + "fields": { + "codename": "change_dating", + "name": "Can change Dating", + "content_type": 45 + } + }, + { + "pk": 156, + "model": "auth.permission", + "fields": { + "codename": "delete_dating", + "name": "Can delete Dating", + "content_type": 45 + } + }, + { + "pk": 151, + "model": "auth.permission", + "fields": { + "codename": "add_datingquality", + "name": "Can add Dating quality", + "content_type": 44 + } + }, + { + "pk": 152, + "model": "auth.permission", + "fields": { + "codename": "change_datingquality", + "name": "Can change Dating quality", + "content_type": 44 + } + }, + { + "pk": 153, + "model": "auth.permission", + "fields": { + "codename": "delete_datingquality", + "name": "Can delete Dating quality", + "content_type": 44 + } + }, + { + "pk": 148, + "model": "auth.permission", + "fields": { + "codename": "add_datingtype", + "name": "Can add Dating type", + "content_type": 43 + } + }, + { + "pk": 149, + "model": "auth.permission", + "fields": { + "codename": "change_datingtype", + "name": "Can change Dating type", + "content_type": 43 + } + }, + { + "pk": 150, + "model": "auth.permission", + "fields": { + "codename": "delete_datingtype", + "name": "Can delete Dating type", + "content_type": 43 + } + }, + { + "pk": 166, + "model": "auth.permission", + "fields": { + "codename": "add_historicalcontextrecord", + "name": "Can add historical context record", + "content_type": 49 + } + }, + { + "pk": 167, + "model": "auth.permission", + "fields": { + "codename": "change_historicalcontextrecord", + "name": "Can change historical context record", + "content_type": 49 + } + }, + { + "pk": 168, + "model": "auth.permission", + "fields": { + "codename": "delete_historicalcontextrecord", + "name": "Can delete historical context record", + "content_type": 49 + } + }, + { + "pk": 163, + "model": "auth.permission", + "fields": { + "codename": "add_identificationtype", + "name": "Can add Type Identification", + "content_type": 48 + } + }, + { + "pk": 164, + "model": "auth.permission", + "fields": { + "codename": "change_identificationtype", + "name": "Can change Type Identification", + "content_type": 48 + } + }, + { + "pk": 165, + "model": "auth.permission", + "fields": { + "codename": "delete_identificationtype", + "name": "Can delete Type Identification", + "content_type": 48 + } + }, + { + "pk": 157, + "model": "auth.permission", + "fields": { + "codename": "add_unit", + "name": "Can add Type Unit", + "content_type": 46 + } + }, + { + "pk": 158, + "model": "auth.permission", + "fields": { + "codename": "change_unit", + "name": "Can change Type Unit", + "content_type": 46 + } + }, + { + "pk": 159, + "model": "auth.permission", + "fields": { + "codename": "delete_unit", + "name": "Can delete Type Unit", + "content_type": 46 + } + }, + { + "pk": 94, + "model": "auth.permission", + "fields": { + "codename": "add_file", + "name": "Can add Archaeological file", + "content_type": 29 + } + }, + { + "pk": 98, + "model": "auth.permission", + "fields": { + "codename": "add_own_file", + "name": "Can add own Archaelogical file", + "content_type": 29 + } + }, + { + "pk": 95, + "model": "auth.permission", + "fields": { + "codename": "change_file", + "name": "Can change Archaeological file", + "content_type": 29 + } + }, + { + "pk": 99, + "model": "auth.permission", + "fields": { + "codename": "change_own_file", + "name": "Can change own Archaelogical file", + "content_type": 29 + } + }, + { + "pk": 264, + "model": "auth.permission", + "fields": { + "codename": "close_file", + "name": "Can close File", + "content_type": 29 + } + }, + { + "pk": 96, + "model": "auth.permission", + "fields": { + "codename": "delete_file", + "name": "Can delete Archaeological file", + "content_type": 29 + } + }, + { + "pk": 100, + "model": "auth.permission", + "fields": { + "codename": "delete_own_file", + "name": "Can delete own Archaelogical file", + "content_type": 29 + } + }, + { + "pk": 241, + "model": "auth.permission", + "fields": { + "codename": "view_file", + "name": "Can view all Archaelogical file", + "content_type": 29 + } + }, + { + "pk": 97, + "model": "auth.permission", + "fields": { + "codename": "view_own_file", + "name": "Can view own Archaelogical file", + "content_type": 29 + } + }, + { + "pk": 101, + "model": "auth.permission", + "fields": { + "codename": "add_filebydepartment", + "name": "Can add file by department", + "content_type": 30 + } + }, + { + "pk": 102, + "model": "auth.permission", + "fields": { + "codename": "change_filebydepartment", + "name": "Can change file by department", + "content_type": 30 + } + }, + { + "pk": 103, + "model": "auth.permission", + "fields": { + "codename": "delete_filebydepartment", + "name": "Can delete file by department", + "content_type": 30 + } + }, + { + "pk": 82, + "model": "auth.permission", + "fields": { + "codename": "add_filetype", + "name": "Can add Archaeological file type", + "content_type": 25 + } + }, + { + "pk": 83, + "model": "auth.permission", + "fields": { + "codename": "change_filetype", + "name": "Can change Archaeological file type", + "content_type": 25 + } + }, + { + "pk": 84, + "model": "auth.permission", + "fields": { + "codename": "delete_filetype", + "name": "Can delete Archaeological file type", + "content_type": 25 + } + }, + { + "pk": 91, + "model": "auth.permission", + "fields": { + "codename": "add_historicalfile", + "name": "Can add historical file", + "content_type": 28 + } + }, + { + "pk": 92, + "model": "auth.permission", + "fields": { + "codename": "change_historicalfile", + "name": "Can change historical file", + "content_type": 28 + } + }, + { + "pk": 93, + "model": "auth.permission", + "fields": { + "codename": "delete_historicalfile", + "name": "Can delete historical file", + "content_type": 28 + } + }, + { + "pk": 85, + "model": "auth.permission", + "fields": { + "codename": "add_permittype", + "name": "Can add Permit type", + "content_type": 26 + } + }, + { + "pk": 86, + "model": "auth.permission", + "fields": { + "codename": "change_permittype", + "name": "Can change Permit type", + "content_type": 26 + } + }, + { + "pk": 87, + "model": "auth.permission", + "fields": { + "codename": "delete_permittype", + "name": "Can delete Permit type", + "content_type": 26 + } + }, + { + "pk": 88, + "model": "auth.permission", + "fields": { + "codename": "add_saisinetype", + "name": "Can add Type Saisine", + "content_type": 27 + } + }, + { + "pk": 89, + "model": "auth.permission", + "fields": { + "codename": "change_saisinetype", + "name": "Can change Type Saisine", + "content_type": 27 + } + }, + { + "pk": 90, + "model": "auth.permission", + "fields": { + "codename": "delete_saisinetype", + "name": "Can delete Type Saisine", + "content_type": 27 + } + }, + { + "pk": 201, + "model": "auth.permission", + "fields": { + "codename": "add_basefind", + "name": "Can add Base find", + "content_type": 58 + } + }, + { + "pk": 205, + "model": "auth.permission", + "fields": { + "codename": "add_own_basefind", + "name": "Can add own Base find", + "content_type": 58 + } + }, + { + "pk": 202, + "model": "auth.permission", + "fields": { + "codename": "change_basefind", + "name": "Can change Base find", + "content_type": 58 + } + }, + { + "pk": 206, + "model": "auth.permission", + "fields": { + "codename": "change_own_basefind", + "name": "Can change own Base find", + "content_type": 58 + } + }, + { + "pk": 203, + "model": "auth.permission", + "fields": { + "codename": "delete_basefind", + "name": "Can delete Base find", + "content_type": 58 + } + }, + { + "pk": 207, + "model": "auth.permission", + "fields": { + "codename": "delete_own_basefind", + "name": "Can delete own Base find", + "content_type": 58 + } + }, + { + "pk": 242, + "model": "auth.permission", + "fields": { + "codename": "view_basefind", + "name": "Can view all Base find", + "content_type": 58 + } + }, + { + "pk": 204, + "model": "auth.permission", + "fields": { + "codename": "view_own_basefind", + "name": "Can view own Base find", + "content_type": 58 + } + }, + { + "pk": 249, + "model": "auth.permission", + "fields": { + "codename": "add_conservatorystate", + "name": "Can add Conservatory state", + "content_type": 67 + } + }, + { + "pk": 250, + "model": "auth.permission", + "fields": { + "codename": "change_conservatorystate", + "name": "Can change Conservatory state", + "content_type": 67 + } + }, + { + "pk": 251, + "model": "auth.permission", + "fields": { + "codename": "delete_conservatorystate", + "name": "Can delete Conservatory state", + "content_type": 67 + } + }, + { + "pk": 211, + "model": "auth.permission", + "fields": { + "codename": "add_find", + "name": "Can add Find", + "content_type": 60 + } + }, + { + "pk": 215, + "model": "auth.permission", + "fields": { + "codename": "add_own_find", + "name": "Can add own Find", + "content_type": 60 + } + }, + { + "pk": 212, + "model": "auth.permission", + "fields": { + "codename": "change_find", + "name": "Can change Find", + "content_type": 60 + } + }, + { + "pk": 216, + "model": "auth.permission", + "fields": { + "codename": "change_own_find", + "name": "Can change own Find", + "content_type": 60 + } + }, + { + "pk": 213, + "model": "auth.permission", + "fields": { + "codename": "delete_find", + "name": "Can delete Find", + "content_type": 60 + } + }, + { + "pk": 217, + "model": "auth.permission", + "fields": { + "codename": "delete_own_find", + "name": "Can delete own Find", + "content_type": 60 + } + }, + { + "pk": 244, + "model": "auth.permission", + "fields": { + "codename": "view_find", + "name": "Can view all Find", + "content_type": 60 + } + }, + { + "pk": 214, + "model": "auth.permission", + "fields": { + "codename": "view_own_find", + "name": "Can view own Find", + "content_type": 60 + } + }, + { + "pk": 218, + "model": "auth.permission", + "fields": { + "codename": "add_findsource", + "name": "Can add Find documentation", + "content_type": 61 + } + }, + { + "pk": 219, + "model": "auth.permission", + "fields": { + "codename": "change_findsource", + "name": "Can change Find documentation", + "content_type": 61 + } + }, + { + "pk": 220, + "model": "auth.permission", + "fields": { + "codename": "delete_findsource", + "name": "Can delete Find documentation", + "content_type": 61 + } + }, + { + "pk": 198, + "model": "auth.permission", + "fields": { + "codename": "add_historicalbasefind", + "name": "Can add historical base find", + "content_type": 57 + } + }, + { + "pk": 199, + "model": "auth.permission", + "fields": { + "codename": "change_historicalbasefind", + "name": "Can change historical base find", + "content_type": 57 + } + }, + { + "pk": 200, + "model": "auth.permission", + "fields": { + "codename": "delete_historicalbasefind", + "name": "Can delete historical base find", + "content_type": 57 + } + }, + { + "pk": 208, + "model": "auth.permission", + "fields": { + "codename": "add_historicalfind", + "name": "Can add historical find", + "content_type": 59 + } + }, + { + "pk": 209, + "model": "auth.permission", + "fields": { + "codename": "change_historicalfind", + "name": "Can change historical find", + "content_type": 59 + } + }, + { + "pk": 210, + "model": "auth.permission", + "fields": { + "codename": "delete_historicalfind", + "name": "Can delete historical find", + "content_type": 59 + } + }, + { + "pk": 224, + "model": "auth.permission", + "fields": { + "codename": "add_historicaltreatment", + "name": "Can add historical treatment", + "content_type": 63 + } + }, + { + "pk": 225, + "model": "auth.permission", + "fields": { + "codename": "change_historicaltreatment", + "name": "Can change historical treatment", + "content_type": 63 + } + }, + { + "pk": 226, + "model": "auth.permission", + "fields": { + "codename": "delete_historicaltreatment", + "name": "Can delete historical treatment", + "content_type": 63 + } + }, + { + "pk": 195, + "model": "auth.permission", + "fields": { + "codename": "add_materialtype", + "name": "Can add Material type", + "content_type": 56 + } + }, + { + "pk": 196, + "model": "auth.permission", + "fields": { + "codename": "change_materialtype", + "name": "Can change Material type", + "content_type": 56 + } + }, + { + "pk": 197, + "model": "auth.permission", + "fields": { + "codename": "delete_materialtype", + "name": "Can delete Material type", + "content_type": 56 + } + }, + { + "pk": 237, + "model": "auth.permission", + "fields": { + "codename": "add_property", + "name": "Can add Property", + "content_type": 66 + } + }, + { + "pk": 238, + "model": "auth.permission", + "fields": { + "codename": "change_property", + "name": "Can change Property", + "content_type": 66 + } + }, + { + "pk": 239, + "model": "auth.permission", + "fields": { + "codename": "delete_property", + "name": "Can delete Property", + "content_type": 66 + } + }, + { + "pk": 231, + "model": "auth.permission", + "fields": { + "codename": "add_own_treatment", + "name": "Can add own Treatment", + "content_type": 64 + } + }, + { + "pk": 227, + "model": "auth.permission", + "fields": { + "codename": "add_treatment", + "name": "Can add Treatment", + "content_type": 64 + } + }, + { + "pk": 232, + "model": "auth.permission", + "fields": { + "codename": "change_own_treatment", + "name": "Can change own Treatment", + "content_type": 64 + } + }, + { + "pk": 228, + "model": "auth.permission", + "fields": { + "codename": "change_treatment", + "name": "Can change Treatment", + "content_type": 64 + } + }, + { + "pk": 233, + "model": "auth.permission", + "fields": { + "codename": "delete_own_treatment", + "name": "Can delete own Treatment", + "content_type": 64 + } + }, + { + "pk": 229, + "model": "auth.permission", + "fields": { + "codename": "delete_treatment", + "name": "Can delete Treatment", + "content_type": 64 + } + }, + { + "pk": 230, + "model": "auth.permission", + "fields": { + "codename": "view_own_treatment", + "name": "Can view own Treatment", + "content_type": 64 + } + }, + { + "pk": 247, + "model": "auth.permission", + "fields": { + "codename": "view_treatment", + "name": "Can view all Treatment", + "content_type": 64 + } + }, + { + "pk": 234, + "model": "auth.permission", + "fields": { + "codename": "add_treatmentsource", + "name": "Can add Treatment documentation", + "content_type": 65 + } + }, + { + "pk": 235, + "model": "auth.permission", + "fields": { + "codename": "change_treatmentsource", + "name": "Can change Treatment documentation", + "content_type": 65 + } + }, + { + "pk": 236, + "model": "auth.permission", + "fields": { + "codename": "delete_treatmentsource", + "name": "Can delete Treatment documentation", + "content_type": 65 + } + }, + { + "pk": 221, + "model": "auth.permission", + "fields": { + "codename": "add_treatmenttype", + "name": "Can add Treatment type", + "content_type": 62 + } + }, + { + "pk": 222, + "model": "auth.permission", + "fields": { + "codename": "change_treatmenttype", + "name": "Can change Treatment type", + "content_type": 62 + } + }, + { + "pk": 223, + "model": "auth.permission", + "fields": { + "codename": "delete_treatmenttype", + "name": "Can delete Treatment type", + "content_type": 62 + } + }, + { + "pk": 129, + "model": "auth.permission", + "fields": { + "codename": "add_acttype", + "name": "Can add Act type", + "content_type": 38 + } + }, + { + "pk": 130, + "model": "auth.permission", + "fields": { + "codename": "change_acttype", + "name": "Can change Act type", + "content_type": 38 + } + }, + { + "pk": 131, + "model": "auth.permission", + "fields": { + "codename": "delete_acttype", + "name": "Can delete Act type", + "content_type": 38 + } + }, + { + "pk": 135, + "model": "auth.permission", + "fields": { + "codename": "add_administrativeact", + "name": "Can add Administrative act", + "content_type": 40 + } + }, + { + "pk": 139, + "model": "auth.permission", + "fields": { + "codename": "add_own_administrativeact", + "name": "Can add own Administrative act", + "content_type": 40 + } + }, + { + "pk": 136, + "model": "auth.permission", + "fields": { + "codename": "change_administrativeact", + "name": "Can change Administrative act", + "content_type": 40 + } + }, + { + "pk": 140, + "model": "auth.permission", + "fields": { + "codename": "change_own_administrativeact", + "name": "Can change own Administrative act", + "content_type": 40 + } + }, + { + "pk": 137, + "model": "auth.permission", + "fields": { + "codename": "delete_administrativeact", + "name": "Can delete Administrative act", + "content_type": 40 + } + }, + { + "pk": 141, + "model": "auth.permission", + "fields": { + "codename": "delete_own_administrativeact", + "name": "Can delete own Administrative act", + "content_type": 40 + } + }, + { + "pk": 240, + "model": "auth.permission", + "fields": { + "codename": "view_administrativeact", + "name": "Can view all Administrative act", + "content_type": 40 + } + }, + { + "pk": 138, + "model": "auth.permission", + "fields": { + "codename": "view_own_administrativeact", + "name": "Can view own Administrative act", + "content_type": 40 + } + }, + { + "pk": 255, + "model": "auth.permission", + "fields": { + "codename": "add_archaeologicalsite", + "name": "Can add Archaeological site", + "content_type": 69 + } + }, + { + "pk": 260, + "model": "auth.permission", + "fields": { + "codename": "add_own_archaeologicalsite", + "name": "Can add own Archaeological site", + "content_type": 69 + } + }, + { + "pk": 256, + "model": "auth.permission", + "fields": { + "codename": "change_archaeologicalsite", + "name": "Can change Archaeological site", + "content_type": 69 + } + }, + { + "pk": 261, + "model": "auth.permission", + "fields": { + "codename": "change_own_archaeologicalsite", + "name": "Can change own Archaeological site", + "content_type": 69 + } + }, + { + "pk": 257, + "model": "auth.permission", + "fields": { + "codename": "delete_archaeologicalsite", + "name": "Can delete Archaeological site", + "content_type": 69 + } + }, + { + "pk": 262, + "model": "auth.permission", + "fields": { + "codename": "delete_own_archaeologicalsite", + "name": "Can delete own Archaeological site", + "content_type": 69 + } + }, + { + "pk": 258, + "model": "auth.permission", + "fields": { + "codename": "view_archaeologicalsite", + "name": "Can view all Archaeological site", + "content_type": 69 + } + }, + { + "pk": 259, + "model": "auth.permission", + "fields": { + "codename": "view_own_archaeologicalsite", + "name": "Can view own Archaeological site", + "content_type": 69 + } + }, + { + "pk": 132, + "model": "auth.permission", + "fields": { + "codename": "add_historicaladministrativeact", + "name": "Can add historical administrative act", + "content_type": 39 + } + }, + { + "pk": 133, + "model": "auth.permission", + "fields": { + "codename": "change_historicaladministrativeact", + "name": "Can change historical administrative act", + "content_type": 39 + } + }, + { + "pk": 134, + "model": "auth.permission", + "fields": { + "codename": "delete_historicaladministrativeact", + "name": "Can delete historical administrative act", + "content_type": 39 + } + }, + { + "pk": 113, + "model": "auth.permission", + "fields": { + "codename": "add_historicaloperation", + "name": "Can add historical operation", + "content_type": 34 + } + }, + { + "pk": 114, + "model": "auth.permission", + "fields": { + "codename": "change_historicaloperation", + "name": "Can change historical operation", + "content_type": 34 + } + }, + { + "pk": 115, + "model": "auth.permission", + "fields": { + "codename": "delete_historicaloperation", + "name": "Can delete historical operation", + "content_type": 34 + } + }, + { + "pk": 116, + "model": "auth.permission", + "fields": { + "codename": "add_operation", + "name": "Can add Operation", + "content_type": 35 + } + }, + { + "pk": 120, + "model": "auth.permission", + "fields": { + "codename": "add_own_operation", + "name": "Can add own Operation", + "content_type": 35 + } + }, + { + "pk": 117, + "model": "auth.permission", + "fields": { + "codename": "change_operation", + "name": "Can change Operation", + "content_type": 35 + } + }, + { + "pk": 121, + "model": "auth.permission", + "fields": { + "codename": "change_own_operation", + "name": "Can change own Operation", + "content_type": 35 + } + }, + { + "pk": 263, + "model": "auth.permission", + "fields": { + "codename": "close_operation", + "name": "Can close Operation", + "content_type": 35 + } + }, + { + "pk": 118, + "model": "auth.permission", + "fields": { + "codename": "delete_operation", + "name": "Can delete Operation", + "content_type": 35 + } + }, + { + "pk": 122, + "model": "auth.permission", + "fields": { + "codename": "delete_own_operation", + "name": "Can delete own Operation", + "content_type": 35 + } + }, + { + "pk": 245, + "model": "auth.permission", + "fields": { + "codename": "view_operation", + "name": "Can view all Operation", + "content_type": 35 + } + }, + { + "pk": 119, + "model": "auth.permission", + "fields": { + "codename": "view_own_operation", + "name": "Can view own Operation", + "content_type": 35 + } + }, + { + "pk": 123, + "model": "auth.permission", + "fields": { + "codename": "add_operationbydepartment", + "name": "Can add operation by department", + "content_type": 36 + } + }, + { + "pk": 124, + "model": "auth.permission", + "fields": { + "codename": "change_operationbydepartment", + "name": "Can change operation by department", + "content_type": 36 + } + }, + { + "pk": 125, + "model": "auth.permission", + "fields": { + "codename": "delete_operationbydepartment", + "name": "Can delete operation by department", + "content_type": 36 + } + }, + { + "pk": 126, + "model": "auth.permission", + "fields": { + "codename": "add_operationsource", + "name": "Can add Operation documentation", + "content_type": 37 + } + }, + { + "pk": 127, + "model": "auth.permission", + "fields": { + "codename": "change_operationsource", + "name": "Can change Operation documentation", + "content_type": 37 + } + }, + { + "pk": 128, + "model": "auth.permission", + "fields": { + "codename": "delete_operationsource", + "name": "Can delete Operation documentation", + "content_type": 37 + } + }, + { + "pk": 104, + "model": "auth.permission", + "fields": { + "codename": "add_operationtype", + "name": "Can add Operation type", + "content_type": 31 + } + }, + { + "pk": 105, + "model": "auth.permission", + "fields": { + "codename": "change_operationtype", + "name": "Can change Operation type", + "content_type": 31 + } + }, + { + "pk": 106, + "model": "auth.permission", + "fields": { + "codename": "delete_operationtype", + "name": "Can delete Operation type", + "content_type": 31 + } + }, + { + "pk": 142, + "model": "auth.permission", + "fields": { + "codename": "add_parcel", + "name": "Can add Parcel", + "content_type": 41 + } + }, + { + "pk": 143, + "model": "auth.permission", + "fields": { + "codename": "change_parcel", + "name": "Can change Parcel", + "content_type": 41 + } + }, + { + "pk": 144, + "model": "auth.permission", + "fields": { + "codename": "delete_parcel", + "name": "Can delete Parcel", + "content_type": 41 + } + }, + { + "pk": 145, + "model": "auth.permission", + "fields": { + "codename": "add_parcelowner", + "name": "Can add Parcel owner", + "content_type": 42 + } + }, + { + "pk": 146, + "model": "auth.permission", + "fields": { + "codename": "change_parcelowner", + "name": "Can change Parcel owner", + "content_type": 42 + } + }, + { + "pk": 147, + "model": "auth.permission", + "fields": { + "codename": "delete_parcelowner", + "name": "Can delete Parcel owner", + "content_type": 42 + } + }, + { + "pk": 110, + "model": "auth.permission", + "fields": { + "codename": "add_period", + "name": "Can add Type Period", + "content_type": 33 + } + }, + { + "pk": 111, + "model": "auth.permission", + "fields": { + "codename": "change_period", + "name": "Can change Type Period", + "content_type": 33 + } + }, + { + "pk": 112, + "model": "auth.permission", + "fields": { + "codename": "delete_period", + "name": "Can delete Type Period", + "content_type": 33 + } + }, + { + "pk": 107, + "model": "auth.permission", + "fields": { + "codename": "add_remaintype", + "name": "Can add Remain type", + "content_type": 32 + } + }, + { + "pk": 108, + "model": "auth.permission", + "fields": { + "codename": "change_remaintype", + "name": "Can change Remain type", + "content_type": 32 + } + }, + { + "pk": 109, + "model": "auth.permission", + "fields": { + "codename": "delete_remaintype", + "name": "Can delete Remain type", + "content_type": 32 + } + }, + { + "pk": 192, + "model": "auth.permission", + "fields": { + "codename": "add_container", + "name": "Can add Container", + "content_type": 55 + } + }, + { + "pk": 193, + "model": "auth.permission", + "fields": { + "codename": "change_container", + "name": "Can change Container", + "content_type": 55 + } + }, + { + "pk": 194, + "model": "auth.permission", + "fields": { + "codename": "delete_container", + "name": "Can delete Container", + "content_type": 55 + } + }, + { + "pk": 189, + "model": "auth.permission", + "fields": { + "codename": "add_containertype", + "name": "Can add Container type", + "content_type": 54 + } + }, + { + "pk": 190, + "model": "auth.permission", + "fields": { + "codename": "change_containertype", + "name": "Can change Container type", + "content_type": 54 + } + }, + { + "pk": 191, + "model": "auth.permission", + "fields": { + "codename": "delete_containertype", + "name": "Can delete Container type", + "content_type": 54 + } + }, + { + "pk": 186, + "model": "auth.permission", + "fields": { + "codename": "add_own_warehouse", + "name": "Can add own Warehouse", + "content_type": 53 + } + }, + { + "pk": 182, + "model": "auth.permission", + "fields": { + "codename": "add_warehouse", + "name": "Can add Warehouse", + "content_type": 53 + } + }, + { + "pk": 187, + "model": "auth.permission", + "fields": { + "codename": "change_own_warehouse", + "name": "Can change own Warehouse", + "content_type": 53 + } + }, + { + "pk": 183, + "model": "auth.permission", + "fields": { + "codename": "change_warehouse", + "name": "Can change Warehouse", + "content_type": 53 + } + }, + { + "pk": 188, + "model": "auth.permission", + "fields": { + "codename": "delete_own_warehouse", + "name": "Can delete own Warehouse", + "content_type": 53 + } + }, + { + "pk": 184, + "model": "auth.permission", + "fields": { + "codename": "delete_warehouse", + "name": "Can delete Warehouse", + "content_type": 53 + } + }, + { + "pk": 185, + "model": "auth.permission", + "fields": { + "codename": "view_own_warehouse", + "name": "Can view own Warehouse", + "content_type": 53 + } + }, + { + "pk": 248, + "model": "auth.permission", + "fields": { + "codename": "view_warehouse", + "name": "Can view all Warehouse", + "content_type": 53 + } + }, + { + "pk": 179, + "model": "auth.permission", + "fields": { + "codename": "add_warehousetype", + "name": "Can add Warehouse type", + "content_type": 52 + } + }, + { + "pk": 180, + "model": "auth.permission", + "fields": { + "codename": "change_warehousetype", + "name": "Can change Warehouse type", + "content_type": 52 + } + }, + { + "pk": 181, + "model": "auth.permission", + "fields": { + "codename": "delete_warehousetype", + "name": "Can delete Warehouse type", + "content_type": 52 + } + }, + { + "pk": 4, + "model": "auth.permission", + "fields": { + "codename": "add_group", + "name": "Can add group", + "content_type": 2 + } + }, + { + "pk": 5, + "model": "auth.permission", + "fields": { + "codename": "change_group", + "name": "Can change group", + "content_type": 2 + } + }, + { + "pk": 6, + "model": "auth.permission", + "fields": { + "codename": "delete_group", + "name": "Can delete group", + "content_type": 2 + } + }, + { + "pk": 1, + "model": "auth.permission", + "fields": { + "codename": "add_permission", + "name": "Can add permission", + "content_type": 1 + } + }, + { + "pk": 2, + "model": "auth.permission", + "fields": { + "codename": "change_permission", + "name": "Can change permission", + "content_type": 1 + } + }, + { + "pk": 3, + "model": "auth.permission", + "fields": { + "codename": "delete_permission", + "name": "Can delete permission", + "content_type": 1 + } + }, + { + "pk": 7, + "model": "auth.permission", + "fields": { + "codename": "add_user", + "name": "Can add user", + "content_type": 3 + } + }, + { + "pk": 8, + "model": "auth.permission", + "fields": { + "codename": "change_user", + "name": "Can change user", + "content_type": 3 + } + }, + { + "pk": 9, + "model": "auth.permission", + "fields": { + "codename": "delete_user", + "name": "Can delete user", + "content_type": 3 + } + }, + { + "pk": 13, + "model": "auth.permission", + "fields": { + "codename": "add_contenttype", + "name": "Can add content type", + "content_type": 5 + } + }, + { + "pk": 14, + "model": "auth.permission", + "fields": { + "codename": "change_contenttype", + "name": "Can change content type", + "content_type": 5 + } + }, + { + "pk": 15, + "model": "auth.permission", + "fields": { + "codename": "delete_contenttype", + "name": "Can delete content type", + "content_type": 5 + } + }, + { + "pk": 73, + "model": "auth.permission", + "fields": { + "codename": "add_arrondissement", + "name": "Can add arrondissement", + "content_type": 22 + } + }, + { + "pk": 74, + "model": "auth.permission", + "fields": { + "codename": "change_arrondissement", + "name": "Can change arrondissement", + "content_type": 22 + } + }, + { + "pk": 75, + "model": "auth.permission", + "fields": { + "codename": "delete_arrondissement", + "name": "Can delete arrondissement", + "content_type": 22 + } + }, + { + "pk": 67, + "model": "auth.permission", + "fields": { + "codename": "add_author", + "name": "Can add Author", + "content_type": 20 + } + }, + { + "pk": 68, + "model": "auth.permission", + "fields": { + "codename": "change_author", + "name": "Can change Author", + "content_type": 20 + } + }, + { + "pk": 69, + "model": "auth.permission", + "fields": { + "codename": "delete_author", + "name": "Can delete Author", + "content_type": 20 + } + }, + { + "pk": 64, + "model": "auth.permission", + "fields": { + "codename": "add_authortype", + "name": "Can add Author type", + "content_type": 19 + } + }, + { + "pk": 65, + "model": "auth.permission", + "fields": { + "codename": "change_authortype", + "name": "Can change Author type", + "content_type": 19 + } + }, + { + "pk": 66, + "model": "auth.permission", + "fields": { + "codename": "delete_authortype", + "name": "Can delete Author type", + "content_type": 19 + } + }, + { + "pk": 76, + "model": "auth.permission", + "fields": { + "codename": "add_canton", + "name": "Can add canton", + "content_type": 23 + } + }, + { + "pk": 77, + "model": "auth.permission", + "fields": { + "codename": "change_canton", + "name": "Can change canton", + "content_type": 23 + } + }, + { + "pk": 78, + "model": "auth.permission", + "fields": { + "codename": "delete_canton", + "name": "Can delete canton", + "content_type": 23 + } + }, + { + "pk": 34, + "model": "auth.permission", + "fields": { + "codename": "add_department", + "name": "Can add Department", + "content_type": 12 + } + }, + { + "pk": 35, + "model": "auth.permission", + "fields": { + "codename": "change_department", + "name": "Can change Department", + "content_type": 12 + } + }, + { + "pk": 36, + "model": "auth.permission", + "fields": { + "codename": "delete_department", + "name": "Can delete Department", + "content_type": 12 + } + }, + { + "pk": 252, + "model": "auth.permission", + "fields": { + "codename": "add_documenttemplate", + "name": "Can add Document template", + "content_type": 68 + } + }, + { + "pk": 253, + "model": "auth.permission", + "fields": { + "codename": "change_documenttemplate", + "name": "Can change Document template", + "content_type": 68 + } + }, + { + "pk": 254, + "model": "auth.permission", + "fields": { + "codename": "delete_documenttemplate", + "name": "Can delete Document template", + "content_type": 68 + } + }, + { + "pk": 40, + "model": "auth.permission", + "fields": { + "codename": "add_historicalorganization", + "name": "Can add historical organization", + "content_type": 14 + } + }, + { + "pk": 41, + "model": "auth.permission", + "fields": { + "codename": "change_historicalorganization", + "name": "Can change historical organization", + "content_type": 14 + } + }, + { + "pk": 42, + "model": "auth.permission", + "fields": { + "codename": "delete_historicalorganization", + "name": "Can delete historical organization", + "content_type": 14 + } + }, + { + "pk": 61, + "model": "auth.permission", + "fields": { + "codename": "add_ishtaruser", + "name": "Can add Ishtar user", + "content_type": 18 + } + }, + { + "pk": 62, + "model": "auth.permission", + "fields": { + "codename": "change_ishtaruser", + "name": "Can change Ishtar user", + "content_type": 18 + } + }, + { + "pk": 63, + "model": "auth.permission", + "fields": { + "codename": "delete_ishtaruser", + "name": "Can delete Ishtar user", + "content_type": 18 + } + }, + { + "pk": 43, + "model": "auth.permission", + "fields": { + "codename": "add_organization", + "name": "Can add Organization", + "content_type": 15 + } + }, + { + "pk": 47, + "model": "auth.permission", + "fields": { + "codename": "add_own_organization", + "name": "Can add own Organization", + "content_type": 15 + } + }, + { + "pk": 44, + "model": "auth.permission", + "fields": { + "codename": "change_organization", + "name": "Can change Organization", + "content_type": 15 + } + }, + { + "pk": 48, + "model": "auth.permission", + "fields": { + "codename": "change_own_organization", + "name": "Can change own Organization", + "content_type": 15 + } + }, + { + "pk": 45, + "model": "auth.permission", + "fields": { + "codename": "delete_organization", + "name": "Can delete Organization", + "content_type": 15 + } + }, + { + "pk": 49, + "model": "auth.permission", + "fields": { + "codename": "delete_own_organization", + "name": "Can delete own Organization", + "content_type": 15 + } + }, + { + "pk": 246, + "model": "auth.permission", + "fields": { + "codename": "view_organization", + "name": "Can view all Organization", + "content_type": 15 + } + }, + { + "pk": 46, + "model": "auth.permission", + "fields": { + "codename": "view_own_organization", + "name": "Can view own Organization", + "content_type": 15 + } + }, + { + "pk": 37, + "model": "auth.permission", + "fields": { + "codename": "add_organizationtype", + "name": "Can add Organization type", + "content_type": 13 + } + }, + { + "pk": 38, + "model": "auth.permission", + "fields": { + "codename": "change_organizationtype", + "name": "Can change Organization type", + "content_type": 13 + } + }, + { + "pk": 39, + "model": "auth.permission", + "fields": { + "codename": "delete_organizationtype", + "name": "Can delete Organization type", + "content_type": 13 + } + }, + { + "pk": 58, + "model": "auth.permission", + "fields": { + "codename": "add_own_person", + "name": "Can add own Person", + "content_type": 17 + } + }, + { + "pk": 53, + "model": "auth.permission", + "fields": { + "codename": "add_person", + "name": "Can add Person", + "content_type": 17 + } + }, + { + "pk": 59, + "model": "auth.permission", + "fields": { + "codename": "change_own_person", + "name": "Can change own Person", + "content_type": 17 + } + }, + { + "pk": 54, + "model": "auth.permission", + "fields": { + "codename": "change_person", + "name": "Can change Person", + "content_type": 17 + } + }, + { + "pk": 60, + "model": "auth.permission", + "fields": { + "codename": "delete_own_person", + "name": "Can delete own Person", + "content_type": 17 + } + }, + { + "pk": 55, + "model": "auth.permission", + "fields": { + "codename": "delete_person", + "name": "Can delete Person", + "content_type": 17 + } + }, + { + "pk": 57, + "model": "auth.permission", + "fields": { + "codename": "view_own_person", + "name": "Can view own Person", + "content_type": 17 + } + }, + { + "pk": 56, + "model": "auth.permission", + "fields": { + "codename": "view_person", + "name": "Can view Person", + "content_type": 17 + } + }, + { + "pk": 50, + "model": "auth.permission", + "fields": { + "codename": "add_persontype", + "name": "Can add Person type", + "content_type": 16 + } + }, + { + "pk": 51, + "model": "auth.permission", + "fields": { + "codename": "change_persontype", + "name": "Can change Person type", + "content_type": 16 + } + }, + { + "pk": 52, + "model": "auth.permission", + "fields": { + "codename": "delete_persontype", + "name": "Can delete Person type", + "content_type": 16 + } + }, + { + "pk": 70, + "model": "auth.permission", + "fields": { + "codename": "add_sourcetype", + "name": "Can add Source type", + "content_type": 21 + } + }, + { + "pk": 71, + "model": "auth.permission", + "fields": { + "codename": "change_sourcetype", + "name": "Can change Source type", + "content_type": 21 + } + }, + { + "pk": 72, + "model": "auth.permission", + "fields": { + "codename": "delete_sourcetype", + "name": "Can delete Source type", + "content_type": 21 + } + }, + { + "pk": 79, + "model": "auth.permission", + "fields": { + "codename": "add_town", + "name": "Can add Town", + "content_type": 24 + } + }, + { + "pk": 80, + "model": "auth.permission", + "fields": { + "codename": "change_town", + "name": "Can change Town", + "content_type": 24 + } + }, + { + "pk": 81, + "model": "auth.permission", + "fields": { + "codename": "delete_town", + "name": "Can delete Town", + "content_type": 24 + } + }, + { + "pk": 28, + "model": "auth.permission", + "fields": { + "codename": "add_wizard", + "name": "Can add Wizard", + "content_type": 10 + } + }, + { + "pk": 29, + "model": "auth.permission", + "fields": { + "codename": "change_wizard", + "name": "Can change Wizard", + "content_type": 10 + } + }, + { + "pk": 30, + "model": "auth.permission", + "fields": { + "codename": "delete_wizard", + "name": "Can delete Wizard", + "content_type": 10 + } + }, + { + "pk": 31, + "model": "auth.permission", + "fields": { + "codename": "add_wizardstep", + "name": "Can add Wizard step", + "content_type": 11 + } + }, + { + "pk": 32, + "model": "auth.permission", + "fields": { + "codename": "change_wizardstep", + "name": "Can change Wizard step", + "content_type": 11 + } + }, + { + "pk": 33, + "model": "auth.permission", + "fields": { + "codename": "delete_wizardstep", + "name": "Can delete Wizard step", + "content_type": 11 + } + }, + { + "pk": 25, + "model": "auth.permission", + "fields": { + "codename": "add_registrationprofile", + "name": "Can add registration profile", + "content_type": 9 + } + }, + { + "pk": 26, + "model": "auth.permission", + "fields": { + "codename": "change_registrationprofile", + "name": "Can change registration profile", + "content_type": 9 + } + }, + { + "pk": 27, + "model": "auth.permission", + "fields": { + "codename": "delete_registrationprofile", + "name": "Can delete registration profile", + "content_type": 9 + } + }, + { + "pk": 16, + "model": "auth.permission", + "fields": { + "codename": "add_session", + "name": "Can add session", + "content_type": 6 + } + }, + { + "pk": 17, + "model": "auth.permission", + "fields": { + "codename": "change_session", + "name": "Can change session", + "content_type": 6 + } + }, + { + "pk": 18, + "model": "auth.permission", + "fields": { + "codename": "delete_session", + "name": "Can delete session", + "content_type": 6 + } + }, + { + "pk": 19, + "model": "auth.permission", + "fields": { + "codename": "add_site", + "name": "Can add site", + "content_type": 7 + } + }, + { + "pk": 20, + "model": "auth.permission", + "fields": { + "codename": "change_site", + "name": "Can change site", + "content_type": 7 + } + }, + { + "pk": 21, + "model": "auth.permission", + "fields": { + "codename": "delete_site", + "name": "Can delete site", + "content_type": 7 + } + }, + { + "pk": 22, + "model": "auth.permission", + "fields": { + "codename": "add_migrationhistory", + "name": "Can add migration history", + "content_type": 8 + } + }, + { + "pk": 23, + "model": "auth.permission", + "fields": { + "codename": "change_migrationhistory", + "name": "Can change migration history", + "content_type": 8 + } + }, + { + "pk": 24, + "model": "auth.permission", + "fields": { + "codename": "delete_migrationhistory", + "name": "Can delete migration history", + "content_type": 8 + } + }, + { "pk": 2, "model": "auth.group", "fields": { @@ -283,6 +2659,26 @@ } }, { + "pk": 28, + "model": "auth.group", + "fields": { + "name": "Op\u00e9rations : clore", + "permissions": [ + 263 + ] + } + }, + { + "pk": 29, + "model": "auth.group", + "fields": { + "name": "Dossiers : clore", + "permissions": [ + 264 + ] + } + }, + { "pk": 7, "model": "ishtar_common.persontype", "fields": { @@ -312,23 +2708,29 @@ "available": true, "txt_idx": "sra_agent", "groups": [ + 2, + 1, + 4, + 3, + 5, + 7, + 6, + 8, + 9, 10, 13, - 15, 14, - 17, + 15, 16, + 17, 18, + 21, 22, - 1, - 2, - 5, - 4, - 7, - 6, - 9, - 8, - 21 + 23, + 24, + 25, + 26, + 27 ], "label": "Agent SRA (prescripteur)" } @@ -348,7 +2750,7 @@ "pk": 8, "model": "ishtar_common.persontype", "fields": { - "comment": "", + "comment": null, "available": true, "txt_idx": "responsible_planning_service", "groups": [], @@ -385,11 +2787,11 @@ "available": true, "txt_idx": "secretarial_dept", "groups": [ - 1, 2, + 1, 3, - 6, 7, + 6, 8, 9, 10, @@ -401,7 +2803,9 @@ 24, 25, 26, - 27 + 27, + 28, + 29 ], "label": "Secr\u00e9tariat SRA" } diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 5fc717c9f..ba583438c 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -201,10 +201,12 @@ def get_item(model, func_name, default_name, extra_request_keys=[], # if not specific any perm is relevant (read right) if specific_perms and perm not in specific_perms: continue - if request.user.has_perm(perm): + if request.user.has_perm(perm) \ + or request.user.ishtaruser.has_right(perm): allowed = True if "_own_" not in perm: own = False + break # max right reach if not allowed: return HttpResponse(None, mimetype='text/plain') if 'type' in dct: |