excluded fields in forms

diff --git a/telemeta/forms/format.py b/telemeta/forms/format.py
index 7462369573647ae4632bb93475861ca3ec7e65d2..fa3cc1c5bb83eef17d5c2828ee31a45e93d99640 100644 (file)
--- a/telemeta/forms/format.py
+++ b/telemeta/forms/format.py
@@ -6,3 +6,4 @@ from telemeta.models import *
 class FormatForm(ModelForm):
     class Meta:
         model = Format
+        exclude = ('item')

diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py
index c222eaebbb2c02dadabd675d38a63359f334e16d..2fec286e95f5afed77f36b0aac05abf0a912c425 100644 (file)
--- a/telemeta/forms/media.py
+++ b/telemeta/forms/media.py
@@ -69,6 +69,9 @@ class MediaCollectionRelatedForm(ModelForm):
 class MediaItemForm(ModelForm):
     class Meta:
         model = MediaItem
+
+        exclude = ('copied_from_item')
+
     def clean_code(self):
         return self.cleaned_data['code'] or None
 
@@ -92,3 +95,4 @@ class MediaItemPerformanceForm(ModelForm):
 class PlaylistForm(ModelForm):
     class Meta:
         model = Playlist
+

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index e22224aac2259630938613184f26e4425c9a8821..e4c0148dac0859f3a5fcb0cd79d569139e9647df 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -20,11 +20,13 @@
 
     {% for field in form %}
     <tr>
-    {% if field.html_name in hidden_fields %}
-        <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td>
-    {% else %}
-        <tr><td class="error">{{ field.errors }}</td></tr>
-        <td>{{ field.label_tag }}:</td>
+    <tr><td class="error">{{ field.errors }}</td></tr>
+        <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 />
@@ -32,7 +34,6 @@
             {% else %}
             <td>{{ field }}</td>
             {% endif %}
-    {% endif %}
     </tr>
     {% endfor %}
     {% endfor %}

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 5fea683427989e484620f7ac9a89b32b20129e45..a2199140885732e89c7688cddb22fa3a73dcc3a4 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -206,14 +206,12 @@ class ItemView(object):
             format_form = FormatForm(instance=format, prefix='format')
 
         forms = [item_form, format_form]
-        hidden_fields = ['item-copied_from_item', 'format-item']
 
         return render(request, template,
                     {'item': item, 'export_formats': formats,
                     'visualizers': graphers, 'visualizer_id': grapher_id,
                     'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True),
                     'forms': forms, 'previous' : previous, 'next' : next, 'mime_type': mime_type,
-                    'hidden_fields': hidden_fields,
                     })
 
     def related_media_item_stream(self, request, item_public_id, media_id):