fix form files submission and redirection

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index f5d6bef24b197a12afa0ab683d2d513f64cdb315..a470e9ce383479be2706627ca912652b2dc88c00 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -61,8 +61,10 @@
 
 {% block content %}
 <h3><img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}</h3>
-<div class="{% if item.file and item.public_access == 'full' or public_access or user.is_staff %}with-rightcol{% endif %}">
-    {% if item.file and item.public_access == 'full' or public_access or user.is_staff %}
+
+<div class="{% if item.file %}{% if item.public_access == 'full' or public_access or user.is_staff %}with-rightcol{% endif %}{% endif %}">
+   {% if item.file %}
+    {% if item.public_access == 'full' or public_access or user.is_staff %}
     <div id="player_maximized" class="ts-skin-lab">
         <a href="#" class="toggle">Minimize</a>
         <div class="wazing"></div>
@@ -163,7 +165,8 @@
 
     </div>
     {% endif %}
-
+    {% endif %}
+    
     {% block infos %}
     <div class="infos">
         {% block general_info %}

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 220c246c4d9847098f20fd151909ae4fdd069664..0cdd5342fc55451b1f45c7ae57a71d83daf5528f 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -36,6 +36,7 @@ import re
 import os
 import sys
 import csv
+import time
 import datetime
 import timeside
 
@@ -154,11 +155,14 @@ class WebView(object):
     def collection_edit(self, request, public_id, template='telemeta/collection_edit.html'):
         collection = MediaCollection.objects.get(public_id=public_id)
         if request.method == 'POST':
-            form = MediaCollectionForm(request.POST, request.FILES, instance=collection)
+            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()
                 collection.set_revision(request.user)
-                return HttpResponseRedirect('/collections/'+public_id)
+                return HttpResponseRedirect('/collections/'+code)
         else:
             form = MediaCollectionForm(instance=collection)
         return render(request, template, {'collection': collection, "form": form,})
@@ -167,11 +171,14 @@ class WebView(object):
     def collection_add(self, request, template='telemeta/collection_add.html'):
         collection = MediaCollection()
         if request.method == 'POST':
-            form = MediaCollectionForm(request.POST, request.FILES, instance=collection)
+            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()
                 collection.set_revision(request.user)
-                return HttpResponseRedirect('/collections/'+form.cleaned_data['code'])
+                return HttpResponseRedirect('/collections/'+code)
         else:
             form = MediaCollectionForm(instance=collection)
         return render(request, template, {'collection': collection, "form": form,})
@@ -181,10 +188,13 @@ class WebView(object):
         collection = MediaCollection.objects.get(public_id=public_id)
         new_collection = MediaCollection()
         if request.method == 'POST':
-            form = MediaCollectionForm(request.POST, request.FILES, instance=new_collection)
+            form = MediaCollectionForm(data=request.POST, files=request.FILES, instance=new_collection)
             if form.is_valid():
+                code = form.cleaned_data['code']
+                if not code:
+                    code = public_id
                 form.save()
-                return HttpResponseRedirect('/collections/'+form.cleaned_data['code'])
+                return HttpResponseRedirect('/collections/'+code)
         else:
             form = MediaCollectionForm(instance=collection)
         return render(request, template, {'collection': collection, "form": form,})
@@ -292,13 +302,16 @@ class WebView(object):
         analyzers = self.item_analyze(item)
         
         if request.method == 'POST':
-            form = MediaItemForm(request.POST, request.FILES, instance=item)
+            form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
             if form.is_valid():
+                code = form.cleaned_data['code']
+                if not code:
+                    code = public_id
                 form.save()
-                if request.FILES:
-                    self.cache.delete_item_data(form.cleaned_data['code'])
+                if form.files:
+                    self.cache.delete_item_data(code)
                 item.set_revision(request.user)
-                return HttpResponseRedirect('/items/'+form.cleaned_data['code'])
+                return HttpResponseRedirect('/items/'+code)
         else:
             form = MediaItemForm(instance=item)
         
@@ -314,11 +327,14 @@ class WebView(object):
         """Show the details of a given item"""
         item = MediaItem()
         if request.method == 'POST':
-            form = MediaItemForm(request.POST, request.FILES, instance=item)
+            form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
             if form.is_valid():
+                code = form.cleaned_data['code']
+                if not code:
+                    code = public_id
                 form.save()
                 item.set_revision(request.user)
-                return HttpResponseRedirect('/items/'+form.cleaned_data['code'])
+                return HttpResponseRedirect('/items/'+code)
         else:
             form = MediaItemForm(instance=item)
         return render(request, template, {'item': item, "form": form})
@@ -332,9 +348,12 @@ class WebView(object):
         if request.method == 'POST':
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=new_item)
             if form.is_valid():
+                code = form.cleaned_data['code']
+                if not code:
+                    code = public_id
                 form.save()
                 item.set_revision(request.user)
-                return HttpResponseRedirect('/items/'+form.cleaned_data['code'])
+                return HttpResponseRedirect('/items/'+code)
         else:
             form = MediaItemForm(instance=item)
         return render(request, template, {'item': item, "form": form})