# HG changeset patch
# User cavaliet
# Date 1361793515 -3600
# Node ID a528352a15acf66fda270c4526098cc740e0c0b7
# Parent  7fc32e1b2abf4a5a27fb969305003d18079f6438
orm request optimisation.

diff -r 7fc32e1b2abf -r a528352a15ac src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py	Thu Feb 21 17:06:43 2013 +0100
+++ b/src/ldt/ldt/ldt_utils/views/content.py	Mon Feb 25 12:58:35 2013 +0100
@@ -105,7 +105,6 @@
             
             
         except Exception as inst:
-            logging.debug("write_content_base : POST error when processing file:" + str(inst)) #@UndefinedVariable
             form_status = "error"
             #set error for form
             if media_input_type == "url":
@@ -153,9 +152,8 @@
 @transaction.commit_manually
 def write_content_base(request, iri_id=None):
     if iri_id:
-        instance_content = Content.safe_objects.get(iri_id=iri_id) #@UndefinedVariable
+        instance_content = Content.safe_objects.select_related('media_obj','front_project').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
     else:
         logging.debug("No iri_id") #@UndefinedVariable
         instance_content = None
@@ -216,7 +214,6 @@
                             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)) #@UndefinedVariable
             
             if media_valid and content_valid and picture_valid:
     
@@ -279,7 +276,7 @@
         except Exception, e:
             transaction.rollback()
             __, value, traceback = sys.exc_info()
-            return False, False, False, False, False, e, traceback
+            return False, False, False, False, False, False, e, traceback
             
     else:
         form_status = 'empty'
@@ -308,9 +305,9 @@
     except Exception, e:
         transaction.rollback()
         __, __, traceback = sys.exc_info()
-        return False, False, False, False, False, e, traceback
+        return False, False, False, False, False, False, e, traceback
         
-    return content_form, media_form, picture_form, form_status, current_front_project, "", ""
+    return content_form, media_form, picture_form, form_status, instance_content, current_front_project, "", ""
 
 @login_required
 def write_content(request, iri_id=None):  
@@ -352,7 +349,7 @@
         return render_to_response('ldt/ldt_utils/reset_confirm.html', {'errors':errors, 'message':message, 'title': title}, context_instance=RequestContext(request))
     elif submit_action == "reset":
         #TODO : verifier index de la recherche maj
-        content = Content.objects.get(iri_id=iri_id)
+        content = Content.objects.get(iri_id=iri_id).select_related('front_project')
         project_temp = content.front_project
         content.create_front_project()
         content.save()
@@ -361,9 +358,9 @@
     elif submit_action=="close":
         return redirect("root-view")
     else:
-        content_form, media_form, picture_form, form_status, current_front_project, e, traceback = write_content_base(request, iri_id)        
+        content_form, media_form, picture_form, form_status, content_temp, current_front_project, e, traceback = write_content_base(request, iri_id)        
         if iri_id: 
-            content_temp = Content.objects.get(iri_id=iri_id)
+            #content_temp = Content.objects.select_related('media_obj').get(iri_id=iri_id)
             media_temp = content_temp.media_obj
             if media_temp:
                 member_list, admin_list = get_userlist_model(media_temp, request.user)