diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
| commit | 40e3f0a927b22fef64b6a59c006511b4ba243a07 (patch) | |
| tree | cde63d0487fe0112c1d9c243701a48d53075a30e /chimere/admin.py | |
| parent | 4bc82f3f73577118d3cc534eaf749d16321c552a (diff) | |
| parent | 58aba7b0661d51e98132e2ed1b726c865316b4a2 (diff) | |
| download | Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.tar.bz2 Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/views.py
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 977a9b4..ae6fbc4 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -117,7 +117,7 @@ class MarkerAdmin(admin.ModelAdmin): exclude = ['submiter_session_key', 'import_key', 'import_version', 'available_date', 'ref_item'] readonly_fields = ['submiter_email', 'submiter_comment', 'import_source', - 'submiter_name'] + 'submiter_name', 'ref_item', 'modified_since_import'] form = MarkerAdminForm inlines = [MultimediaInline, PictureInline] |