From: yomguy <yomguy@parisson.com>
Date: Tue, 25 Sep 2012 12:14:19 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Tag: 1.4.4-lam~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9a56321fce7aa63290a3e4e41fdbb5f78214bca3;p=telemeta.git

Merge branch 'dev' into lam

Conflicts:
	telemeta/forms/media.py
	telemeta/templates/telemeta/mediaitem_edit.html
---

9a56321fce7aa63290a3e4e41fdbb5f78214bca3
diff --cc telemeta/forms/media.py
index 932c88f2,2fec286e..1180dc0f
--- a/telemeta/forms/media.py
+++ b/telemeta/forms/media.py
@@@ -69,9 -69,8 +69,10 @@@ class MediaCollectionRelatedForm(ModelF
  class MediaItemForm(ModelForm):
      class Meta:
          model = MediaItem
-         fields = ('title', 'recorded_from_date', 'recorded_to_date', 'collector',
-                   'collection', 'summary', 'scientist', 'contributor', 'author',
-                   'topic', 'comment', 'public_access')
 -
 -        exclude = ('copied_from_item')
++        exclude = ('copied_from_item', 'cultural_area', 'ethnic_group', 'language',
++                   'context_comment', 'moda_execut', 'vernacular_style', 'generic_style',
++                   'track', 'collector', 'collector_selection', 'collector_from_collection',
++                   'creator_reference')
  
      def clean_code(self):
          return self.cleaned_data['code'] or None