From: yomguy <yomguy@parisson.com>
Date: Mon, 17 Sep 2012 23:48:26 +0000 (+0200)
Subject: fix some fields, begin field filtering
X-Git-Tag: 1.4.4-lam~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aa1889e62a8d0b8da1bcfb135d414c6ae9800308;p=telemeta.git

fix some fields, begin field filtering
---

diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py
index c222eaeb..932c88f2 100644
--- a/telemeta/forms/media.py
+++ b/telemeta/forms/media.py
@@ -69,6 +69,10 @@ class MediaCollectionRelatedForm(ModelForm):
 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')
+
     def clean_code(self):
         return self.cleaned_data['code'] or None
 
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index aeae1a07..638815bb 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -221,7 +221,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
             {% endif %}
 
             {% dl_field item "author" %}
-            {% dl_field item "subject" %}
+            {% dl_field item "topic" %}
 
             <dt>{% trans "Remarks" %}</dt>
             <dd>{{ item.comment|html_line_break|safe }}</dd>
@@ -245,7 +245,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
             <dl class="listing">
              <dt>{% trans "Organization" %}</dt>
              <dd>{% organization %}</dd>
-             {% dl_field item "public_access_label" %}
+             {% dl_field item "public_access" %}
              {% dl_field item "depositor" %}
              <dt>{% trans "Rights" %}</dt>
              <dd>{% if item.performances %}
diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index e22224aa..09ef8073 100644
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -24,7 +24,12 @@
         <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td>
     {% else %}
         <tr><td class="error">{{ field.errors }}</td></tr>
-        <td>{{ field.label_tag }}:</td>
+        <td>{% if field.required %}
+                <span style="font-weight:bold">{{ field.label_tag }}:</span>
+            {% else %}
+                {{ field.label_tag }}:
+            {% endif %}
+            </td>
             {% if field.html_name == "collection" %}
             <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
                 &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />