platform: comparison src/ldt/ldt/ldt

equal deleted inserted replaced

-:015f40d64d43
+:12ba862f33fa
 from django.contrib.auth.models import Group
 from django.core.urlresolvers import reverse
 from django.forms.models import model_to_dict
 from django.forms.util import ErrorList
 from django.http import HttpResponse
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
 from django.utils.translation import ugettext as _, ungettext
 from ldt.ldt_utils.forms import ContentForm, MediaForm
 from guardian.shortcuts import remove_perm
 from ldt.ldt_utils.models import Content, Media, Project
 import re
 import datetime
 import math
 import requests
 import django.utils.simplejson as simplejson
 import urlparse
 def write_content_base(request, iri_id=None):
 if iri_id:
 instance_content = Content.safe_objects.get(iri_id=iri_id) #@UndefinedVariable
 instance_media = instance_content.media_obj
 logging.debug("write_content_base : valid form: for instance : media -> " + repr(instance_media) + " content : for instance : " + repr(instance_content)) #@UndefinedVariable
 def add_prefix(_dict, prefix):
 return dict([('%s-%s' % (prefix, key), value) for key,value in _dict.items()])
 content_instance_val = add_prefix(content_instance_val, "content")
 media_instance_val= add_prefix(media_instance_val, "media")
+src_video=request.POST.get('media-src')
 for k in request.POST.keys():
 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')
 content_instance_val['share'] = request.POST.get('share', True)
 content_form = ContentForm(content_instance_val, prefix="content", instance=instance_content)
 media_form = MediaForm(media_instance_val, request.FILES, prefix="media", instance=instance_media)
 picture_form = PictureForm(None, request.POST, request.FILES)
 if request.user.is_staff:
 content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content])
 content.front_project = content_defaults['front_project']
 content.save()
 picture_form.model = content
 picture_form.save()
 form_status = 'saved'
 media_form = MediaForm(instance=media, prefix="media")
 content_form = ContentForm(instance=content, prefix="content")
 picture_form = PictureForm()
 else:
 content_form.fields['front_project'].queryset = Project.objects.filter(contents__in=[instance_content])
 return content_form, media_form, picture_form, form_status, current_front_project
 @login_required
 def write_content(request, iri_id=None):
+case=0
 submit_action = request.REQUEST.get("submit_button", False)
 member_list = admin_list = []
 current_front_project = None
 if submit_action == "prepare_delete":
 elif submit_action == "delete":
 delete_content(request, iri_id)
 form_status = "deleted"
 content_form = ContentForm()
 media_form = MediaForm()
 picture_form = PictureForm()
+elif submit_action=="close":
+return redirect("root-view")
 else:
 content_form, media_form, picture_form, form_status, current_front_project = write_content_base(request, iri_id)
 if iri_id:
+case=2
 member_list, admin_list = get_userlist_model(Content.objects.get(iri_id=iri_id), request.user)
 if iri_id:
 create_content_action = reverse('ldt.ldt_utils.views.content.write_content', kwargs={'iri_id':iri_id})
 img_container = content_form.instance
 else:
 create_content_action = reverse('ldt.ldt_utils.views.content.write_content')
 img_container = ''
+case=1
 session_key = request.COOKIES[settings.SESSION_COOKIE_NAME]
 cookie_name = settings.SESSION_COOKIE_NAME
 # Media.safe_objects.all() does not return the good list of media, so we get them from the Content.safe_objects
 content_form.fields["media_obj"].queryset = Media.objects.filter(id__in=Content.safe_objects.values_list('media_obj', flat=True))
-return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_action': create_content_action,
+if form_status=='saved' or form_status=='deleted':
+return redirect("root-view")
+else:
+return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_': create_content_action,
 '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 = []
 titles = []
 elif 'vimeo' in src_video:
 title=data[0]['title']
 else:
 title=data['title']
 return title
+def get_image_json(src_video, data):
+if 'youtube' in src_video:
+lien=data['data']['thumbnail']['sqDefault']
+filename=""+data['data']['id']+".jpg"
+download_path=settings.MEDIA_ROOT+"thumbnails/contents/"
+file_path = "%s\%s" % (download_path, filename)
+video_thumbnail = file(file_path, "wb")
+image_web=urllib2.urlopen(lien)
+while True:
+buf = image_web.read(65536)
+if len(buf) == 0:
+break
+video_thumbnail.write(buf)
+video_thumbnail.close()
+image_web.close()
+return file_path

changeset 791	12ba862f33fa
parent 786	623bc24bee49
child 792	e4180c2d11eb
child 795	923429f142ea