--- a/src/ldt/ldt/ldt_utils/views/content.py	Tue Sep 25 15:13:12 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/content.py	Tue Sep 25 18:06:40 2012 +0200
@@ -241,11 +241,11 @@
                     remove_perm('ldt_utils.view_media', everyone, media)
                     if media:
                         assign_perm_to_obj(media, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
+                    assign_perm_to_obj(content, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user)
                     if content_form.cleaned_data['is_public']:
                         cached_assign('view_content', everyone, content)
                     else:
                         remove_perm('ldt_utils.view_content', everyone, content)
-                        assign_perm_to_obj(content, content_form.cleaned_data['read_list'], content_form.cleaned_data['write_list'], request.user) 
                 
                 if not created:
                     for attribute in ('iriurl', 'title', 'description', 'duration', 'content_creation_date', 'tags', 'media_obj'):
@@ -332,8 +332,12 @@
     if form_status=='saved' or form_status=='deleted':
         return redirect("root-view") 
     else:
+        group_list = Group.objects.all()
+        group_list = group_list.exclude(name=settings.PUBLIC_GROUP_NAME)
+        group_list = [{'name': u.name, 'id': u.id, 'type': 'group'} for u in group_list[0:settings.MAX_USERS_SEARCH]]
+        elem_list = get_userlist(request.user) + group_list
         return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_': create_content_action,
-                                                                    'elem_list': get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list,  'iri_id': iri_id, 'session_key':session_key,
+                                                                    'elem_list':elem_list, 'member_list': member_list, 'admin_list': admin_list,  'iri_id': iri_id, 'session_key':session_key,
                                                                     'cookie_name':cookie_name, 'img_container': img_container, 'profile_picture_form': picture_form,
                                                                     'current_front_project':current_front_project}, context_instance=RequestContext(request))
 @login_required