Changeset 16360cc


Ignore:
Timestamp:
Jun 4, 2011 2:35:10 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, search, security, server, social, storage, telecaster, test, video
Children:
d4c2dd3, b497a41
Parents:
5884d3f
git-author:
yomguy <yomguy@…> (04/06/2011 14:35:10)
git-committer:
yomguy <yomguy@…> (04/06/2011 14:35:10)
Message:

clean collection copy method, timeside watermark

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/web/base.py

    r5884d3f r16360cc  
    196196    @method_decorator(permission_required('telemeta.add_mediacollection')) 
    197197    def collection_copy(self, request, public_id, template='telemeta/collection_edit.html'): 
    198         collection = MediaCollection.objects.get(public_id=public_id) 
    199         new_collection = MediaCollection() 
    200         if request.method == 'POST': 
     198        if request.method == 'POST': 
     199            new_collection = MediaCollection() 
    201200            form = MediaCollectionForm(data=request.POST, files=request.FILES, instance=new_collection) 
    202201            if form.is_valid(): 
     
    208207                return HttpResponseRedirect('/collections/'+code) 
    209208        else: 
     209            collection = MediaCollection.objects.get(public_id=public_id) 
    210210            form = MediaCollectionForm(instance=collection) 
    211211         
     
    474474                pipe = decoder | graph 
    475475                pipe.run() 
    476                 graph.watermark('telemeta', opacity=.6, margin=(5,5)) 
     476                graph.watermark('timeside', opacity=.6, margin=(5,5)) 
    477477                f = open(path, 'w') 
    478478                graph.render(path) 
Note: See TracChangeset for help on using the changeset viewer.