Contents can be added in Ligne de temps
authorverrierj
Fri, 04 Nov 2011 10:23:18 +0100
changeset 220 74738cf15d99
parent 219 1288e2e1fa03
child 221 fff164d7d6ad
Contents can be added in Ligne de temps
src/ldt/ldt/ldt_utils/views.py
--- a/src/ldt/ldt/ldt_utils/views.py	Wed Nov 02 12:41:48 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/views.py	Fri Nov 04 10:23:18 2011 +0100
@@ -231,7 +231,7 @@
                     desc = content.description        
                 complete_results.append({'list' : segments, 'score' : score, 'content_title' : content.title, 'content_id' : content.iri_id, 'content_description' : desc })
             complete_results.sort(key=lambda k: k['score'])  
-                    
+             
             request.session['complete_results'] = complete_results
             request.session['search'] = search
             request.session['field'] = field
@@ -251,12 +251,11 @@
     else:
         return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project'))
         
-
+@login_required       
 def search_listing(request):
-    if not request.session.__contains__('complete_results'):
-        msg = _("Please enter valid keywords.")
-        return render_to_response('ldt/ldt_utils/search_results.html', {'msg' : msg}, context_instance=RequestContext(request))
- 
+    if not request.session.has_key('complete_results'):
+        return HttpResponseRedirect(reverse('ldt.ldt_utils.views.published_project'))
+     
     complete_results = request.session.get('complete_results')
     search = request.session.get('search')
     field = request.session.get('field')
@@ -526,6 +525,17 @@
     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'
@@ -768,7 +778,7 @@
 def update_project(request, ldt_id):
 
     project = get_object_or_404(Project, ldt_id=ldt_id)
-    contents = project.contents.all()
+    contents = project.contents.all()    
     if request.method == "POST" :
         submit_action = request.REQUEST.get("submit_button", False)
         if submit_action == "prepare_delete":