# HG changeset patch # User grandjoncl # Date 1348478975 -7200 # Node ID 87598228cfbba3c7941f78f38913ddbbd92349b0 # Parent e4180c2d11ebee44ce28ab8287c84689bd54f803 Correction of a bug when the image link doesn't exist diff -r e4180c2d11eb -r 87598228cfbb src/ldt/ldt/ldt_utils/views/content.py --- a/src/ldt/ldt/ldt_utils/views/content.py Mon Sep 24 11:01:39 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/views/content.py Mon Sep 24 11:29:35 2012 +0200 @@ -68,7 +68,6 @@ value = request.POST.get(k) content_instance_val[k] = value media_instance_val[k] = value - logging.debug("keys : "+k+"value : "+value+" Louiselogging") content_instance_val['read_list'] = request.POST.getlist('read_list') content_instance_val['write_list'] = request.POST.getlist('write_list') @@ -76,9 +75,7 @@ content_form = ContentForm(content_instance_val, prefix="content", instance=instance_content) media_form = MediaForm(media_instance_val, request.FILES, prefix="media", instance=instance_media) - logging.debug("loulou : POST : "+str(request.POST)+" FILES : "+str(request.FILES)) picture_form = PictureForm(None, request.POST, request.FILES) - logging.debug(str(picture_form.fields['image'])+" poissonrouge") if request.user.is_staff: content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content]) @@ -87,14 +84,17 @@ media_valid = media_form.is_valid() content_valid = content_form.is_valid() picture_valid = picture_form.is_valid() - lien_image=request.POST.get('url_image') - if picture_valid and lien_image!='': - r=requests.get(lien_image) - img_temp=tempfile.NamedTemporaryFile(suffix='.png') - if img_temp: - img_temp.write(r.content) - img_temp.flush() - picture_form.cleaned_data["image"]=File(img_temp) + image_link = request.POST.get('url_image') + if picture_valid and image_link!='': + try : + r = requests.get(image_link) + img_temp = tempfile.NamedTemporaryFile(suffix='.png') + if img_temp: + img_temp.write(r.content) + img_temp.flush() + picture_form.cleaned_data["image"]=File(img_temp) + except Exception as inst: + logging.debug("couldn't download video thumbnail from image_link : "+str(image_link)) logging.debug("write_content_base : valid form: for instance : " + repr(instance_media) + " -> media " + str(media_valid) + " content : for instance : " + repr(instance_content) + " : " + str(content_valid) + "picture : valid :" +str(picture_valid)+" loulou") #@UndefinedVariable if media_valid and content_valid and picture_valid: @@ -328,9 +328,6 @@ 'elem_list': get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list, 'iri_id': iri_id, 'session_key':session_key, 'cookie_name':cookie_name, 'img_container': img_container, 'profile_picture_form': picture_form, 'current_front_project':current_front_project}, context_instance=RequestContext(request)) - #else : - # - @login_required def prepare_delete_content(request, iri_id=None): errors = []