Changeset 5addd73

Timestamp:

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

Author:

yomguy <yomguy@…>

Branches:

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

Children:

57fd750

Parents:

c89e8e54

git-author:

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

git-committer:

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

Message:

fix item copy with format

Location:

telemeta

Files:

• templates/telemeta/mediaitem_copy.html (modified) (3 diffs)
• views/base.py (modified) (2 diffs)

telemeta/templates/telemeta/mediaitem_copy.html

@@ -19 +19 @@
 
 {% block content %}
-  {% block infos %}    
+  {% block infos %}
     <div class="infos">
      <form enctype="multipart/form-data" id="_mediaItemCopyForm" method="post" action="">{% csrf_token %}
      <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 %}
@@ -41 +42 @@
             </tr>
        {% endfor %}
+       {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">
@@ -49 +51 @@
      </form>
     </div>
-  {% endblock infos %}  
+  {% endblock infos %}
 {% endblock %}
 

telemeta/views/base.py

@@ -802 +802 @@
             source_item = MediaItem.objects.get(public_id=public_id)
             item = MediaItem()
-            form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
-            if form.is_valid():
-                form.save()
-                code = form.cleaned_data['code']
+            format = Format()
+            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()
+                code = item_form.cleaned_data['code']
                 if not code:
                     code = str(item.id)
+                if format_form.is_valid():
+                    format.item = item
+                    format_form.save()
 
                 performances = MediaItemPerformance.objects.filter(media_item=source_item)
@@ -830 +836 @@
             item.code = auto_code(items, item.collection.code)
             item.approx_duration = ''
-            form = MediaItemForm(instance=item)
-            form.code = item.code
-            form.file = None
-
-        return render(request, template, {'item': item, "form": form})
+            item_form = MediaItemForm(instance=item, prefix='item')
+            format, created = Format.objects.get_or_create(item=item)
+            format_form = FormatForm(instance=format, prefix='format')
+            item_form.code = item.code
+            item_form.file = None
+
+        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.delete_mediaitem'))