@@ -196,15 +196,15 @@ class Photo(Media): galleries__exact=gallery,) except Photo.DoesNotExist: return None - + def get_thumbnail_url(self): - return self.image.mediumthumb.url + return self.image.thumbnail.url def get_thumbnail_width(self): - return self.image.mediumthumb.get_width() + return self.image.thumbnail.get_width() def get_thumbnail_height(self): - return self.image.mediumthumb.get_height() + return self.image.thumbnail.get_height() def get_original_url(self): return self.image.image.url limestone/photos/models.py @@ -79,7 +79,6 @@ def save_photo(request,metastory_id,story_id,multimedia_id=None): form = PhotoForm() upload_form = ImageForm(request.POST, request.FILES) - upload_valid = True if not multimedia_id: if upload_form.is_valid(): multimedia = Photo(created_by = request.user, story=story, created_at = datetime.now()) @@ -94,8 +93,11 @@ def save_photo(request,metastory_id,story_id,multimedia_id=None): form = PhotoForm(instance=multimedia) else: - request.user.message_set.create(message="0|A file is required for upload.") - return HttpResponseRedirect( reverse('photo_edit', args=[metastory_id,story_id,multimedia.id]) ) + emsg = '' + for value in upload_form.errors: + emsg +=' '+value+' '+str(upload_form.errors[value]) + request.user.message_set.create(message="0|A file is required for upload."+emsg) + return HttpResponseRedirect( reverse('photo_new', args=[metastory_id,story_id]) ) else: multimedia = get_object_or_404(Photo, pk=multimedia_id, story=story) image_url = multimedia.image.image.name limestone/photos/views.py @@ -32,7 +32,9 @@ def edit_metastory(request,metastory_id): stories = Story.objects.filter(metastory__id=metastory_id) breadcrumb = [ {'title':metastory,'url':reverse('metastory_edit', args=[metastory_id])} ] used_tags = metastory._get_tags() - return render_to_response("story/metastory.html", {'breadcrumb':breadcrumb,'form':form,'tags':tags,'used_tags':used_tags,'form_url':reverse('metastory_update', args=[metastory_id]),'stories':stories,'metastory_id':metastory_id}, context_instance=RequestContext(request)) + story_photos = Media.children.filter(story__in=stories.values_list('id',flat=True),_child_name="photo",status="Approved") + + return render_to_response("story/metastory.html", {'breadcrumb':breadcrumb,'form':form,'tags':tags,'used_tags':used_tags,'form_url':reverse('metastory_update', args=[metastory_id]),'stories':stories,'metastory_id':metastory_id,'story_photos':story_photos}, context_instance=RequestContext(request)) @login_required @@ -98,6 +100,7 @@ def edit_story(request,metastory_id,story_id): members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct() authors = story.authors.all() photos = story.authors.all() + story_photos = Media.children.filter(story=story,_child_name="photo",status="Approved") inherited_tags = [] inherited_tag_ids = [] @@ -112,7 +115,7 @@ def edit_story(request,metastory_id,story_id): used_tags = story._get_tags() breadcrumb = [ {'title':story.metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} ] - return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'media_assets':assets,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id}, context_instance=RequestContext(request)) + return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'media_assets':assets,'inherited_tags':inherited_tags,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id,'story_photos':story_photos}, context_instance=RequestContext(request)) @login_required @@ -125,12 +128,12 @@ def save_story(request,metastory_id,story_id=None): story = Story(created_by = request.user, metastory=metastory) #story.metastory=metastory - story.authors = request.POST.getlist('authors') story.updated_by = request.user form = StoryForm(request.POST,instance=story) if form.is_valid(): form.save() + story.authors = request.POST.getlist('authors') request.user.message_set.create(message="1|Your story was saved successfully.") stags = '' @@ -145,7 +148,7 @@ def save_story(request,metastory_id,story_id=None): assets = Media.children.filter(story=story) members = auth.User.objects.filter(newsroom_members__metastory_newsrooms__newsrooms__id__in=metastory.newsrooms.values_list('id',flat=True)).distinct() - authors = story.authors.all() + authors = request.POST.getlist('authors') inherited_tags = [] inherited_tag_ids = [] @@ -161,8 +164,12 @@ def save_story(request,metastory_id,story_id=None): for tag in Tag.objects.all(): if request.POST.__contains__('tag_%d' % tag.id): used_tags.append(tag) - - breadcrumb = [ {'title':story.metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} ] - return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'media_assets':assets,'tags':tags,'used_tags':used_tags,'form_url':reverse('story_update', args=[metastory_id,story_id]),'metastory_id':metastory_id,'story_id':story_id,'inherited_tags':inherited_tags}, context_instance=RequestContext(request)) + if story_id: + breadcrumb = [ {'title':story.metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':story,'url':reverse('story_edit', args=[metastory_id,story_id])} ] + form_url = reverse('story_update', args=[metastory_id,story_id]) + else: + breadcrumb = [ {'title':story.metastory,'url':reverse('metastory_edit', args=[metastory_id])} , {'title':'New Story','url':reverse('story_new', args=[metastory_id])} ] + form_url = reverse('story_create', args=[metastory_id]) + return render_to_response("story/story.html", {'breadcrumb':breadcrumb,'form':form,'newsrooms_members':members,'authors':authors,'media_assets':assets,'tags':tags,'used_tags':used_tags,'form_url':form_url,'metastory_id':metastory_id,'story_id':story_id,'inherited_tags':inherited_tags}, context_instance=RequestContext(request)) else: return HttpResponseRedirect( settings.LOGIN_REDIRECT_URL ) \ No newline at end of file limestone/story/views.py @@ -50,6 +50,12 @@ <br/> <br/> <h4>Package Primary Image</h4> + + {% for photo in story_photos %} + <div class="sidebar-right-listing alternating-row-{% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}"> + <input type="radio" name="primary_image" id="primary_image"><img src="{{ photo.get_thumbnail_url }}" /> + </div> + {% endfor %} </div> <div class="clear"></div> limestone/templates/n21alpha/story/metastory.html @@ -72,6 +72,12 @@ <br/> <br/> <h4>Story Primary Image</h4> + + {% for photo in story_photos %} + <div class="sidebar-right-listing alternating-row-{% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}"> + <input type="radio" name="primary_image" id="primary_image"><img src="{{ photo.get_thumbnail_url }}" /> + </div> + {% endfor %} </div> <div class="clear"></div> limestone/templates/n21alpha/story/story.html d164980f5559fd34b7a514317cccc45e75efd45f bhalle bhalle@JRNN21.local http://github.com/bhalle/limestone/commit/2df168e7a5080c3d569990e0aba367feec6c4f3e 2df168e7a5080c3d569990e0aba367feec6c4f3e 2009-11-04T00:11:51-08:00 2009-11-04T00:11:51-08:00 updated primary image display 8f94a213aa9cadebcc55c09c59fdd42319fcf85a bhalle bhalle@JRNN21.local