Fix bugs in forms
authorverrierj
Thu, 02 Feb 2012 16:10:55 +0100
changeset 511 2edec83f1bd8
parent 510 496917cf614a
child 513 d7a40f4dc38b
Fix bugs in forms
src/ldt/ldt/ldt_utils/forms.py
src/ldt/ldt/ldt_utils/views/front.py
src/ldt/ldt/ldt_utils/views/workspace.py
src/ldt/ldt/user/forms.py
--- a/src/ldt/ldt/ldt_utils/forms.py	Thu Feb 02 15:44:35 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/forms.py	Thu Feb 02 16:10:55 2012 +0100
@@ -51,7 +51,8 @@
     media_input_type = forms.ChoiceField(required=False, label=_("content.media_input_type"), choices=(("upload", _("file_upload")), ("url", _("url")), ("link", _("existing_media")), ("create", _("create_media")), ("none", _("none_media"))))
     groups = forms.ModelMultipleChoiceField(Group.objects.all(), required=False)
     is_public = forms.BooleanField(required=False)
-    front_project = forms.ModelChoiceField(queryset=Project.objects.none(), required=False, label=_("content.front_project")) 
+    front_project = forms.ModelChoiceField(queryset=Project.objects.none(), required=False, label=_("content.front_project"))
+    duration = forms.IntegerField(required=True) 
         
     def clean_iri_id(self):
         data = self.cleaned_data.get('iri_id')
--- a/src/ldt/ldt/ldt_utils/views/front.py	Thu Feb 02 15:44:35 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/front.py	Thu Feb 02 16:10:55 2012 +0100
@@ -120,12 +120,10 @@
                               context_instance=RequestContext(request))
 
 
-@login_required
 def search_index(request):
     return ws_search_index(request, front_template=True)
 
 
-@login_required
 def search_listing(request):
     return ws_search_listing(request, front_template=True)
 
--- a/src/ldt/ldt/ldt_utils/views/workspace.py	Thu Feb 02 15:44:35 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py	Thu Feb 02 16:10:55 2012 +0100
@@ -151,7 +151,6 @@
     return render_to_response('ldt/ldt_utils/search_form.html', {'form': form} , context_instance=RequestContext(request))
 
 
-@login_required
 def search_index(request, front_template=False):
         
     sform = SearchForm(request.POST)
@@ -167,10 +166,11 @@
         else:
             results = get_results_with_context(field, search) 
             
-            Segment.safe_objects.check_perm = False # no permission policy for segments
-            all_segments = Segment.safe_objects.filter(element_id__in=[e['element_id'] for e in results])
-            all_projects = Project.safe_objects.filter(ldt_id__in=[e['project_id'] for e in results], state=2)
-            all_contents = Content.safe_objects.filter(iri_id__in=[e['iri_id'] for e in results])
+            # Search results come from published project
+            # We do not apply permissions here since it has to be reached from unlogged users.
+            all_segments = Segment.objects.filter(element_id__in=[e['element_id'] for e in results])
+            all_projects = Project.objects.filter(ldt_id__in=[e['project_id'] for e in results], state=2)
+            all_contents = Content.objects.filter(iri_id__in=[e['iri_id'] for e in results])
             viewable_projects_id = [p.ldt_id for p in all_projects]
             
             complete_results = []           
--- a/src/ldt/ldt/user/forms.py	Thu Feb 02 15:44:35 2012 +0100
+++ b/src/ldt/ldt/user/forms.py	Thu Feb 02 16:10:55 2012 +0100
@@ -141,7 +141,7 @@
         
         class_name = self.model.__class__.__name__
         if class_name == 'User' or class_name == 'Group':
-            instance_name = self.model.id
+            instance_name = "%s" % self.model.id
             img_container = self.model.get_profile()
         elif class_name == 'Content':
             instance_name = self.model.iri_id