diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /archaeological_operations/ishtar_menu.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'archaeological_operations/ishtar_menu.py')
| -rw-r--r-- | archaeological_operations/ishtar_menu.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py index a0852147a..5f937f01c 100644 --- a/archaeological_operations/ishtar_menu.py +++ b/archaeological_operations/ishtar_menu.py @@ -66,7 +66,7 @@ MENU_SECTIONS = [ 'change_administrativeact']), MenuItem( 'operation_administrativeactop', - _(u"Add"), + _(u"Creation"), model=models.AdministrativeAct, access_controls=['change_administrativeact']), MenuItem( @@ -94,7 +94,7 @@ MENU_SECTIONS = [ access_controls=['view_operation', 'view_own_operation']), MenuItem('operation_source_creation', - _(u"Add"), + _(u"Creation"), model=models.OperationSource, access_controls=['change_operation', 'change_own_operation']), |