diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:05:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:05:13 +0200 |
| commit | dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4 (patch) | |
| tree | 4fdfe0c828e975812fdc6a8ededba4995300ecc2 /archaeological_operations/admin.py | |
| parent | 5f77b4d18fdd1f4b8c6e967d65dc949197a28243 (diff) | |
| parent | 6bcaf64532e8b1ea76e5e74e3291fac2b238f838 (diff) | |
| download | Ishtar-dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4.tar.bz2 Ishtar-dd098e6bab668d5d602b2d5c4dd64af3d0aa62b4.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/views.py
Diffstat (limited to 'archaeological_operations/admin.py')
| -rw-r--r-- | archaeological_operations/admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index 9f886bc62..d976aac77 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -31,7 +31,7 @@ class AdministrativeActAdmin(HistorizedObjectAdmin): list_filter = ('act_type',) search_fields = ('year', 'index') readonly_fields = ('in_charge', 'operator', 'scientist', 'signatory', - 'operation', 'associated_file', 'imports', + 'associated_file', 'imports', 'departments_label', 'towns_label', 'history_modifier', 'history_creator') model = models.AdministrativeAct |