platform: comparison src/ldt/ldt/ldt

equal deleted inserted replaced

-:14b59dcd2731
+:1105a5ed9f8f
 return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project'))
 def search_listing(request):
 if not request.session.has_key('complete_results'):
-msg = _("Please enter valid keywords.")
+return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project'))
-return render_to_response('ldt/ldt_utils/search_results.html', {'msg' : msg}, context_instance=RequestContext(request))
 complete_results = request.session.get('complete_results')
 search = request.session.get('search')
 field = request.session.get('field')
 paginator = Paginator(complete_results, settings.LDT_RESULTS_PER_PAGE)
 language_code = request.LANGUAGE_CODE[:2]
 ldtgen = LdtUtils()
 #            generate_ldt(contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None):
 doc = ldtgen.generate_ldt(contentList, title=u"Recherche : " + queryStr, projects=projectList)
 doc = set_forbidden_stream(doc, request.user)
 doc.write(resp, pretty_print=True)
 return resp
 @login_required
 def create_ldt_view(request):
 permission_formset = formset_factory(PermissionForm, extra=0)
 groups = request.user.groups.exclude(name=settings.PUBLIC_GROUP_NAME)
+redirect_to = ''
 if request.method == "POST" :
 form = LdtAddForm(request.POST)
 form_status = "none"
 contents = Content.safe_objects.all()
 management_form = None
 if form.is_valid() and group_form.is_valid():
 user = request.user
-p = Project.create_project(title=form.cleaned_data['title'], user=user, contents=form.cleaned_data['contents'],
+project = Project.create_project(title=form.cleaned_data['title'], user=user, contents=form.cleaned_data['contents'],
 description=form.cleaned_data['description'])
-assign_object_to_groups(p, group_form.cleaned_data)
+assign_object_to_groups(project, group_form.cleaned_data)
 form_status = "saved"
-contents = []
+is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1);
+if is_gecko :
+redirect_to = reverse('index_project_full', args=[project.ldt_id])
+else:
+return HttpResponseRedirect(reverse('index_project', args=[project.ldt_id]))
 else:
 form = LdtAddForm()
 contents = Content.safe_objects.all() #@UndefinedVariable
 perm_list = []
 management_form = permission.management_form
 group_form = zip(permission, groups)
 form_status = "none"
-return render_to_response('ldt/ldt_utils/create_ldt.html', {'contents': contents, 'form': form, 'group_form': group_form, 'management_form': management_form, 'form_status':form_status, 'create_project_action':reverse(create_ldt_view), 'language_code' : settings.LANGUAGE_CODE[2:]}, context_instance=RequestContext(request))
+return render_to_response('ldt/ldt_utils/create_ldt.html', {'contents': contents, 'form': form, 'group_form': group_form, 'management_form': management_form, 'form_status':form_status,
+'redirect_to': redirect_to, 'create_project_action':reverse(create_ldt_view), 'language_code' : settings.LANGUAGE_CODE[2:]}, context_instance=RequestContext(request))
 def created_ldt(request):
 return render_to_response('ldt/ldt_utils/save_done.html', context_instance=RequestContext(request))
 resp['Pragma'] = 'no-cache'
 if project_id and project_id != "_" :
 project = Project.safe_objects.get(ldt_id=project_id) #@UndefinedVariable
 ldtdoc = lxml.etree.fromstring(project.ldt.encode("utf-8"))
 ldtdoc = set_forbidden_stream(ldtdoc, request.user)
 displays_node = ldtdoc.find("displays")
 if not displays_node:
 displays_node = lxml.etree.SubElement(ldtdoc, u"displays")
 res = displays_node.xpath("display")
 'idsegment' : segment_id
 }
 doc = ldtgen.generate_ldt(content_list, "segment : ", author=username, startSegment=start_segment)
 doc = set_forbidden_stream(doc, request.user)
 doc.write(resp, pretty_print=('DEBUG' in dir(settings) and settings.DEBUG))
 return resp
-#        ldtgen.
+@login_required
 def index_project(request, id, full=False):
 urlStr = settings.WEB_URL + reverse("space_ldt_init", args=['ldt_project', id])
 posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.save_ldt_project")
 language_code = request.LANGUAGE_CODE[:2]
 def init(request, method, url):
 ldtgen = LdtUtils()
 doc = ldtgen.generate_init([url], 'ldt.ldt_utils.views.' + method, None)
+library = doc.xpath('/iri/files/library')[0]
+for c in Content.objects.all():
+elem = lxml.etree.SubElement(library, 'file')
+elem.set('src', c.iri_url())
+elem.set('video', c.videopath)
+elem.set('title', c.title)
+elem.set('author', '')
+elem.set('category', '')
+elem.set('pict', '')
+elem.set('img', '')
 resp = HttpResponse(mimetype="text/xml")
 resp['Cache-Control'] = 'no-cache, must-revalidate'
 resp['Pragma'] = 'no-cache'
 def create_project(request, iri_id):
 permission_formset = formset_factory(PermissionForm, extra=0)
 content = get_object_or_404(Content.safe_objects, iri_id=iri_id)
 contents = [ content, ]
 groups = request.user.groups.exclude(name=settings.PUBLIC_GROUP_NAME)
+redirect_to = ''
+form_status = "none"
 if request.method == "POST" :
 group_form = permission_formset(request.POST)
 management_form = None
 form = AddProjectForm(request.POST)
 if form.is_valid() and group_form.is_valid():
 user = request.user
 project = Project.create_project(title=form.cleaned_data['title'], user=user, contents=contents, description=form.cleaned_data['description'])
+form_status = "saved"
 # Modal window is not used with firefox
 is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1);
 if is_gecko :
-return HttpResponseRedirect(reverse('index_project_full', args=[project.ldt_id]))
+redirect_to = reverse('index_project_full', args=[project.ldt_id])
 else:
 return HttpResponseRedirect(reverse('index_project', args=[project.ldt_id]))
 assign_object_to_groups(project, group_form.cleaned_data)
 else:
 form = AddProjectForm()
 management_form = permission.management_form
 group_form = zip(permission, groups)
 # Modal window is not used with firefox, so we ask to submit the form in _parent in firefox case.
 target_parent = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1);
-return render_to_response('ldt/ldt_utils/create_ldt.html', {'form':form, 'contents':contents, 'groups' : groups, 'group_form': group_form, 'management_form': management_form, 'create_project_action':reverse("ldt.ldt_utils.views.create_project", args=[iri_id]), 'target_parent':target_parent}, context_instance=RequestContext(request))
+return render_to_response('ldt/ldt_utils/create_ldt.html', {'form':form, 'form_status': form_status, 'contents':contents,                                                               'groups' : groups, 'group_form': group_form,
+'management_form': management_form, 'redirect_to': redirect_to, 'create_project_action':reverse("ldt.ldt_utils.views.create_project", args=[iri_id]), 'target_parent':target_parent}, context_instance=RequestContext(request))
 @login_required
 def update_project(request, ldt_id):
 permission_formset = formset_factory(PermissionForm, extra=0)
 project = get_object_or_404(Project.safe_objects, ldt_id=ldt_id)
 project.delete()
 form_status = 'deleted'
 form = AddProjectForm()
 group_form = permission_formset()
 else:
-form_status = 'saved'
+form_status = 'none'
 form = AddProjectForm(request.POST)
 group_form = permission_formset(request.POST)
 if form.is_valid() and group_form.is_valid():
 res[0].set("abstract", project.description)
 project.ldt = lxml.etree.tostring(ldt, pretty_print=True)
 project.save()
 assign_object_to_groups(project, group_form.cleaned_data)
+form_status = "saved"
 else:
 form = AddProjectForm({'title':unicode(project.title), 'description':unicode(project.get_description())})
 perm_list = []
 for group in groups:

changeset 262	1105a5ed9f8f
parent 261	14b59dcd2731
parent 227	d79097e98244
child 263	eba92ea32281