From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 13 Nov 2014 14:51:51 +0000 (+0100)
Subject: ix various CREM fields, add collection DC CBV
X-Git-Tag: 1.5.0rc1~27^2~28
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7b21da7203b219ab91b87d3fdafaed575f4f4564;p=telemeta.git

ix various CREM fields, add collection DC CBV
---

diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py
index 2f582554..aeb6937b 100644
--- a/telemeta/forms/media.py
+++ b/telemeta/forms/media.py
@@ -87,8 +87,6 @@ class MediaCorpusRelatedForm(ModelForm):
 
 class MediaCollectionForm(ModelForm):
 
-    required_css_class = 'required'
-
     def __init__(self, *args, **kwargs):
         super(MediaCollectionForm, self).__init__(*args, **kwargs)
         if '_I_' in self.instance.code:
@@ -114,8 +112,11 @@ class MediaItemForm(ModelForm):
 
     class Meta:
         model = MediaItem
-        exclude = ('copied_from_item', 'mimetype', 'url', 'contributor',
-                    'organization', 'depositor', 'rights', 'topic')
+        exclude = ('copied_from_item', 'mimetype', 'url',
+                    'organization', 'depositor', 'rights',
+                    'recordist', 'digitalist', 'digitization_date',
+                    'publishing_date', 'scientist', 'topic',
+                    'summary', 'contributor', )
 
     def clean_code(self):
         return self.cleaned_data['code'] or None
diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 62a68d76..e0446a44 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -150,7 +150,7 @@
                         {% endif %}
                         {% dl_field collection "publishing_status" %}
                         {% dl_field collection "status" %}
-                        {% if collection.alt_ids %}
+                        {% if collection.alt_copies %}
                          {% dl_field collection "alt_copies" %}
                         {% endif %}
                         <dt>{% trans "Comments" %}</dt>
@@ -187,10 +187,10 @@
                         <div class="wazing"></div>
                         <dt>{% trans "Number of items" %}</dt>
                             <dd>{{ collection.items.count }}</dd>
+                        {% dl_field collection "original_format" %}
                         {% if collection.physical_format %}
                         {% dl_field collection "physical_format" %}
                         {% endif %}
-                        {% dl_field collection "original_format" %}
                         {% dl_field collection "ad_conversion" %}
                     </dl>
                 </div>
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 25cd8889..904da1e5 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -235,10 +235,10 @@ Item : <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
         {% block musical_data %}
         <div>
             <h4><a href="#">{% trans "Musical informations" %}</a></h4>
-            {% if item.moda_execut %}
-            {% dl_field item "moda_execut" %}
-            {% endif %}
             <dl class="listing">
+                {% if item.moda_execut %}
+                {% dl_field item "moda_execut" %}
+                {% endif %}
                 {% dl_field item "vernacular_style" %}
                 {% dl_field item "generic_style" %}
                 {% dl_field item "author" %}
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 1a97cdf9..e171f03a 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -107,7 +107,7 @@ urlpatterns = patterns('',
     url(r'^archives/collections_sound/$', CollectionSoundListView.as_view(), name="telemeta-collections-sound"),
 
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/$', CollectionDetailView.as_view(), name="telemeta-collection-detail"),
-    url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/dc/$', collection_view.collection_detail, dict(template="telemeta/collection_detail_dc.html"), name="telemeta-collection-dublincore"),
+    url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/dc/$', CollectionDetailViewDC.as_view(), name="telemeta-collection-dublincore"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/collection_xspf.xml$', collection_view.collection_playlist, dict(template="telemeta/collection_xspf.xml", mimetype="application/xspf+xml"), name="telemeta-collection-xspf"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/collection.m3u$', collection_view.collection_playlist, dict(template="telemeta/collection.m3u", mimetype="audio/mpegurl"), name="telemeta-collection-m3u"),
     url(r'^archives/collections/(?P<public_id>[A-Za-z0-9._-]+)/edit/$', CollectionEditView.as_view(), name="telemeta-collection-edit"),
diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py
index 9e39c84d..a39978a9 100644
--- a/telemeta/views/collection.py
+++ b/telemeta/views/collection.py
@@ -282,11 +282,11 @@ class CollectionDetailView(CollectionViewMixin, DetailView):
         context['collection'] = collection
         context['items'] = items.order_by('code', 'old_code')
 
-        if collection.public_access == 'none' and not (request.user.is_staff or request.user.is_superuser):
+        if collection.public_access == 'none' and not (self.request.user.is_staff or self.request.user.is_superuser):
             mess = ugettext('Access not allowed')
-            title = ugettext('Collection') + ' : ' + public_id + ' : ' + mess
+            title = ugettext('Collection') + ' : ' + collection.public_id + ' : ' + mess
             description = ugettext('Please login or contact the website administator to get a private access.')
-            messages.error(request, title)
+            messages.error(self.request, title)
             return render(self.request, 'telemeta/messages.html', {'description' : description})
 
         context['playlists'] = get_playlists_names(self.request)
@@ -303,6 +303,11 @@ class CollectionDetailView(CollectionViewMixin, DetailView):
         return context
 
 
+class CollectionDetailViewDC(CollectionDetailView):
+
+    template_name = "telemeta/collection_detail_dc.html"
+
+
 class CollectionEditView(CollectionViewMixin, UpdateWithInlinesView):
 
     template_name = 'telemeta/collection_edit.html'