Changeset 16360cc

Timestamp:

06/04/11 14:35:10 (2 years ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

d4c2dd3, b497a41

Parents:

5884d3f

git-author:

yomguy <yomguy@…> (06/04/11 14:35:10)

git-committer:

yomguy <yomguy@…> (06/04/11 14:35:10)

Message:

clean collection copy method, timeside watermark

File:

• telemeta/web/base.py (modified) (3 diffs)

telemeta/web/base.py

@@ -196 +196 @@
     @method_decorator(permission_required('telemeta.add_mediacollection'))
     def collection_copy(self, request, public_id, template='telemeta/collection_edit.html'):
-        collection = MediaCollection.objects.get(public_id=public_id)
-        new_collection = MediaCollection()
-        if request.method == 'POST':
+        if request.method == 'POST':
+            new_collection = MediaCollection()
             form = MediaCollectionForm(data=request.POST, files=request.FILES, instance=new_collection)
             if form.is_valid():
@@ -208 +207 @@
                 return HttpResponseRedirect('/collections/'+code)
         else:
+            collection = MediaCollection.objects.get(public_id=public_id)
             form = MediaCollectionForm(instance=collection)
         
@@ -474 +474 @@
                 pipe = decoder | graph
                 pipe.run()
-                graph.watermark('telemeta', opacity=.6, margin=(5,5))
+                graph.watermark('timeside', opacity=.6, margin=(5,5))
                 f = open(path, 'w')
                 graph.render(path)