# HG changeset patch
# User rougeronj
# Date 1347978131 -7200
# Node ID f094e31cd30b419d2fbb376521b0a2ca308fbeec
# Parent  35631012b6d4cfbc2aa251cdcc121935b4eced7d
merge content.py des modifications de Louise et Julien

diff -r 35631012b6d4 -r f094e31cd30b src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py	Tue Sep 18 15:56:18 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/content.py	Tue Sep 18 16:22:11 2012 +0200
@@ -44,12 +44,7 @@
     
     form_status = 'none'        
     if request.method == "POST":
-        if request.POST.get('content-duration')!='':
-            logging.debug("petitchienmalade il y a duration")
-        else:
-            logging.debug("petitchienmalade il y a pas de duration")
-           
-        logging.debug("on est dans POST")
+        
         if instance_content is not None:
             content_instance_val = model_to_dict(instance_content, exclude=ContentForm.Meta.exclude)
         else:
@@ -94,7 +89,7 @@
         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)) #@UndefinedVariable
         
         if media_valid and content_valid and picture_valid:
-            logging.debug("on est dans media_valid, content_valif, picture_valid")
+
             # see if media must be created
             cleaned_data = {}
             cleaned_data.update(media_form.cleaned_data)
@@ -203,7 +198,6 @@
                     
 
             if media and not created:
-                logging.debug("creation media")
                 for attribute in ('external_id', 'external_permalink', 'external_publication_url', 'external_src_url', 'media_creation_date', 'videopath', 'duration', 'description', 'title', 'front_project'):
                     setattr(media, attribute, cleaned_data.get(attribute))
                 mimetype = cleaned_data.get('mimetype_field', None)
@@ -242,11 +236,9 @@
                     if media:
                         assign_perm_to_obj(media, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
                 if not created:
-                    logging.debug("on cree le media")
-                    for attribute in ('iriurl', 'title', 'description', 'content_creation_date', 'duration', 'tags', 'media_obj'):
+                    for attribute in ('iriurl', 'title', 'description', 'duration', 'content_creation_date', 'tags', 'media_obj'):
                         setattr(content, attribute, content_defaults[attribute])
-                    
-                 
+                        
                     if request.user.is_staff and content_defaults.has_key('front_project'):
                         content.front_project = content_defaults['front_project']
                     
@@ -282,7 +274,6 @@
 
 @login_required
 def write_content(request, iri_id=None):    
-    logging.debug("test write_content test")
     submit_action = request.REQUEST.get("submit_button", False) 
     member_list = admin_list = []
     current_front_project = None
@@ -304,7 +295,6 @@
         picture_form = PictureForm()
     else:
         content_form, media_form, picture_form, form_status, current_front_project = write_content_base(request, iri_id)
-        logging.debug("fin test dans write_content")
         if iri_id:
             member_list, admin_list = get_userlist_model(Content.objects.get(iri_id=iri_id), request.user)