From b9f49cd27f3698a6e7e827dc4d2e88452114e169 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 14 Mar 2011 21:43:03 +0100 Subject: [PATCH] fix revision saving for collections, items and markers. marker.date as DateTimeField --- telemeta/models/media.py | 7 +++---- telemeta/web/base.py | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 23fff26f..15ae8000 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -56,9 +56,8 @@ class MediaResource(ModelCore): return _('Private data') public_access_label.verbose_name = _('public access') - def save_with_revision(self, user, force_insert=False, force_update=False): + def set_revision(self, user): "Save a media object and add a revision" - self.save(force_insert, force_update) Revision.touch(self, user) def get_revision(self): @@ -196,7 +195,7 @@ class MediaCollection(MediaResource): return False - def save(self, force_insert=False, force_update=False): + def save(self, force_insert=False, force_update=False, user=None): if not self.code: raise RequiredFieldError(self, self._meta.get_field('code')) if not self.is_valid_code(self.code): @@ -381,7 +380,7 @@ class MediaItemMarker(MediaResource): public_id = CharField(_('public_id'), required=True) time = FloatField(_('time'), required=True) title = CharField(_('title')) - date = DateField(_('date'), auto_now=True) + date = DateTimeField(_('date'), auto_now=True) description = TextField(_('description')) author = ForeignKey(User, related_name="markers", verbose_name=_('author')) diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 4a66a7d4..f3ae8265 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -142,6 +142,7 @@ class WebView(object): form = MediaCollectionForm(request.POST, request.FILES, instance=collection) if form.is_valid(): form.save() + collection.set_revision(request.user) return HttpResponseRedirect('/collections/'+public_id) else: form = MediaCollectionForm(instance=collection) @@ -154,6 +155,7 @@ class WebView(object): form = MediaCollectionForm(request.POST, request.FILES, instance=collection) if form.is_valid(): form.save() + collection.set_revision(request.user) return HttpResponseRedirect('/collections/'+form.cleaned_data['code']) else: form = MediaCollectionForm(instance=collection) @@ -254,6 +256,7 @@ class WebView(object): form = MediaItemForm(data=request.POST, files=request.FILES, instance=item) if form.is_valid(): form.save() + item.set_revision(request.user) return HttpResponseRedirect('/items/'+public_id) else: form = MediaItemForm(instance=item) @@ -273,6 +276,7 @@ class WebView(object): form = MediaItemForm(data=request.POST, files=request.FILES, instance=item) if form.is_valid(): form.save() + item.set_revision(request.user) return HttpResponseRedirect('/items/'+form.cleaned_data['code']) else: form = MediaItemForm(instance=item) @@ -722,6 +726,7 @@ class WebView(object): m.description = marker['description'] m.author = User.objects.get(username=marker['author']) m.save() + m.set_revision(request.user) else: raise 'Error : Bad marker dictionnary' @@ -753,6 +758,7 @@ class WebView(object): m.title = marker['title'] m.description = marker['description'] m.save() + m.set_revision(request.user) else: raise 'Error : Bad marker dictionnary' -- 2.39.5