Changeset c89e8e54

Timestamp:

05/21/12 17:43:59 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, release/1.4.4, storage

Children:

5addd73

Parents:

bc866e5

git-author:

yomguy <yomguy@…> (05/21/12 17:43:59)

git-committer:

yomguy <yomguy@…> (05/21/12 17:43:59)

Message:

fix item add with format

Location:

telemeta

Files:

• migrations/0015_auto__chg_field_format_item.py (added)
• models/format.py (modified) (1 diff)
• templates/telemeta/mediaitem_add.html (modified) (2 diffs)
• templates/telemeta/mediaitem_detail.html (modified) (1 diff)
• views/base.py (modified) (2 diffs)

telemeta/models/format.py

@@ -54 +54 @@
     """ Physical format object as proposed by the LAM"""
 
-    item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item"))
+    item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item"),
+                                       blank=True, null=True, on_delete=models.SET_NULL)
     original_format       = WeakForeignKey(OriginalFormat, related_name="format",
                                      verbose_name = _("original format"))

telemeta/templates/telemeta/mediaitem_add.html

@@ -23 +23 @@
        <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
        <table>
+       {% for form in forms %}
         {% for field in form %}
             <tr>
-            {% if field.html_name == "copied_from_item" %}
+            {% if field.html_name in hidden_fields %}
                 <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td>
             {% else %}
@@ -39 +40 @@
             {% endif %}
             </tr>
-    {% endfor %}
+        {% endfor %}
+       {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">

telemeta/templates/telemeta/mediaitem_detail.html

@@ -310 +310 @@
                      {% dl_field format "original_location" %}
                      {% dl_field format "original_state" %}
+                     {% dl_field format "original_audio_quality" %}
                      <dt>{% trans "Comments" %}</dt>
                      <dd>{{ format.original_comments|html_line_break|safe }}</dd>

telemeta/views/base.py

@@ -727 +727 @@
             item_form = MediaItemForm(instance=item, prefix='item')
             format_form = FormatForm(instance=format, prefix='format')
-            forms = [item_form, format_form]
-
+
+        forms = [item_form, format_form]
         hidden_fields = ['item-copied_from_item', 'format-item']
 
@@ -769 +769 @@
             code = auto_code(items, collection.code)
             item = MediaItem(collection=collection, code=code)
+            format, created = Format.objects.get_or_create(item=item)
         else:
             item = MediaItem()
-        if request.method == 'POST':
-            form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
-            if form.is_valid():
-                form.save()
+            format = Format()
+
+        if request.method == 'POST':
+            item_form = MediaItemForm(data=request.POST, files=request.FILES, instance=item, prefix='item')
+            format_form = FormatForm(data=request.POST, instance=format, prefix='format')
+            if item_form.is_valid():
+                item_form.save()
                 item.set_revision(request.user)
-                code = form.cleaned_data['code']
+                code = item_form.cleaned_data['code']
                 if not code:
                     code = str(item.id)
+                if format_form.is_valid():
+                    format.item = item
+                    format_form.save()
                 return HttpResponseRedirect('/archives/items/'+code)
         else:
-            form = MediaItemForm(instance=item)
-
-
-        return render(request, template, {'item': item, 'form': form})
+            item_form = MediaItemForm(instance=item, prefix='item')
+            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, 'forms': forms, 'hidden_fields': hidden_fields,})
 
     @method_decorator(permission_required('telemeta.add_mediaitem'))