fix collection add, item copy and add

diff --git a/telemeta/templates/telemeta_default/collection_add.html b/telemeta/templates/telemeta_default/collection_add.html
index 27d0296ca5e2066fe563fe8e1a13f9a3b55fb6ff..abbda5b7a601073f64361ca0cbb1bbacb5b91490 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_add.html
+++ b/telemeta/templates/telemeta_default/collection_add.html
@@ -16,12 +16,14 @@
         <table>
         <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
         {% for field in form %}
-            {% if not field.html_name == "copied_from_item" and not field.html_name == "doctype_code" %}
-            <tr>
-                <tr><td class="error">{{ field.errors }}</td></tr>
-                <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
-            </tr>
-            {% endif %}
+         <tr>
+        {% if field.html_name == "copied_from_item" or field.html_name == "doctype_code" %}
+            <td>{{ field.label_tag.as_hidden }}</td><td>{{ field.as_hidden }}</td>
+        {% else %}
+            <tr><td class="error">{{ field.errors }}</td></tr>
+            <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
+        {% endif %}
+        </tr>
         {% endfor %}
         </table>
         <div align="center" style="margin-top:3ex;">

diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index 31aefe87382e5ffe9d3a6ea14eb34593e8e1677c..ee05ac19746fbf313d3a71e5ed523cf8b01f9e5b 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -22,14 +22,23 @@
      <form method="post" id="_addItemForm" action="" enctype="multipart/form-data">{% csrf_token %}
        <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
        <table>
-       {% for field in form %}
-        {% if not field.html_name == "copied_from_item" %}
-        <tr>
-            <tr><td class="error">{{ field.errors }}</td></tr>
-            <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
-        </tr>
-        {% endif %}
-       {% endfor %}
+        {% for field in form %}
+            <tr>
+            {% if field.html_name == "copied_from_item" %}
+                <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td>
+            {% else %}
+                <tr><td class="error">{{ field.errors }}</td></tr>
+                <td>{{ field.label_tag }}:</td>
+                    {% if field.html_name == "collection" %}
+                    <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
+                        &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />
+                        {{ field }}</td>
+                    {% else %}
+                    <td>{{ field }}</td>
+                    {% endif %}
+            {% endif %}
+            </tr>
+    {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">
         <a href="{% url telemeta-items %}"

diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index 3a0c060b19ab5a35b124608fb8319961494bf822..64bbaac73dd488121b88f5f716a1a75094f0ad51 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -24,19 +24,21 @@
      <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
       <table>
        {% for field in form %}
-        {% if not field.html_name == "copied_from_item" %}
-        <tr>
-            <tr><td class="error">{{ field.errors }}</td></tr>
-            <td>{{ field.label_tag }}:</td>
-             {% if field.html_name == "collection" %}
-              <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
-                  &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />
-                  {{ field }}</td>    
-             {% else %}
-              <td>{{ field }}</td>
-             {% endif %}
-        </tr>
-        {% endif %}
+            <tr>
+            {% if field.html_name == "copied_from_item" %}
+                <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td>
+            {% else %}
+                <tr><td class="error">{{ field.errors }}</td></tr>
+                <td>{{ field.label_tag }}:</td>
+                    {% if field.html_name == "collection" %}
+                    <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
+                        &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />
+                        {{ field }}</td>
+                    {% else %}
+                    <td>{{ field }}</td>
+                    {% endif %}
+            {% endif %}
+            </tr>
        {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 8ce79687a3d7e910466ad862bcb4ee91985fd063..f040a291df5e2c072d7091c17897b857b04e8ac7 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -417,14 +417,14 @@ class CollectionView(object):
     @method_decorator(permission_required('telemeta.add_mediacollection'))
     def collection_copy(self, request, public_id, template='telemeta/collection_edit.html'):
         if request.method == 'POST':
-            new_collection = MediaCollection()
-            form = MediaCollectionForm(data=request.POST, files=request.FILES, instance=new_collection)
+            collection = MediaCollection()
+            form = MediaCollectionForm(data=request.POST, files=request.FILES, instance=collection)
             if form.is_valid():
                 code = form.cleaned_data['code']
                 if not code:
                     code = public_id
                 form.save()
-                new_collection.set_revision(request.user)
+                collection.set_revision(request.user)
                 return HttpResponseRedirect('/collections/'+code)
         else:
             collection = MediaCollection.objects.get(public_id=public_id)
@@ -678,14 +678,14 @@ class ItemView(object):
     def item_copy(self, request, public_id, template='telemeta/mediaitem_copy.html'):
         """Copy a given item"""        
         if request.method == 'POST':
-            new_item = MediaItem()
-            form = MediaItemForm(data=request.POST, files=request.FILES, instance=new_item)
+            item = MediaItem()
+            form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
             if form.is_valid():
                 form.save()
                 code = form.cleaned_data['code']
                 if not code:
-                    code = str(new_item.id)
-                new_item.set_revision(request.user)
+                    code = str(item.id)
+                item.set_revision(request.user)
                 return HttpResponseRedirect('/items/'+code)
         else:
             item = MediaItem.objects.get(public_id=public_id)