# HG changeset patch
# User cavaliet
# Date 1381248202 -7200
# Node ID ffa5e70f643f4befdd7c43720cad47b586e49e6b
# Parent  036877639db64e5586c9f8337242d7be11d7aca8
debug group for django 1.5

diff -r 036877639db6 -r ffa5e70f643f src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Wed Oct 02 17:28:28 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html	Tue Oct 08 18:03:22 2013 +0200
@@ -44,6 +44,14 @@
 
 		var search_url = "{% url 'ldt.ldt_utils.views.workspace.share_filter' filter='__FILTER__' use_groups='false' %}";
 	});
+	function stopRKey(evt) {
+	    console.log(evt);
+	    var evt = (evt) ? evt : ((event) ? event : null);
+	    var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
+	    if ((evt.keyCode == 13) && (node.type=="text"))  {console.log("   ICI"); return false;}
+	}
+
+	document.onkeypress = stopRKey;
 	</script>
 
 {% endblock %}
diff -r 036877639db6 -r ffa5e70f643f src/ldt/ldt/ldt_utils/views/group.py
--- a/src/ldt/ldt/ldt_utils/views/group.py	Wed Oct 02 17:28:28 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/group.py	Tue Oct 08 18:03:22 2013 +0200
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import Group
 from django.db import transaction
@@ -12,6 +13,7 @@
 from ldt.security.utils import add_change_attr, get_userlist, get_userlist_group
 from ldt.user.forms import PictureForm
 
+User = get_user_model()
 
 @login_required
 def get_group_projects_view(request):
@@ -126,7 +128,7 @@
             if form.is_valid() and picture_form.is_valid():
                 name = form.cleaned_data['name']
                 new_member_list = form.cleaned_data['read_list']
-                old_member_list = group.user_set.exclude(id=request.user.id)
+                old_member_list = User.objects.filter(groups=group).exclude(id=request.user.id)
                 admin_list = form.cleaned_data['write_list']
                 group.name = name
                 group.profile.description = form.cleaned_data['description']
@@ -135,8 +137,8 @@
                 for user in new_member_list:
                     if not hasattr(user, 'username'):
                         raise AttributeError('new_member_list should only contain users')
-                    if user != request.user:                      
-                        group.user_set.add(user)
+                    if user != request.user:
+                        user.groups.add(group)
                         if is_owner_group:
                             if user in admin_list:
                                 cached_assign('change_group', user, group)
@@ -145,7 +147,7 @@
                                 
                 for user in old_member_list:
                     if user not in new_member_list:
-                        group.user_set.remove(user)
+                        user.groups.remove(group)
                         remove_perm('change_group', user, group)
                                         
                 group.save()
@@ -168,12 +170,12 @@
     
     
 @login_required
-def groups_filter(request, g_filter):
-    if g_filter and len(g_filter) > 0 and g_filter[0] == '_':
-        g_filter = g_filter[1:]
+def groups_filter(request, filter):
+    if filter and len(filter) > 0 and filter[0] == '_':
+        filter = filter[1:]
 
     if filter:
-        group_list = request.user.groups.filter(name__icontains=g_filter)
+        group_list = request.user.groups.filter(name__icontains=filter)
         search_active = True 
     else:
         group_list = request.user.groups.all()
diff -r 036877639db6 -r ffa5e70f643f src/ldt/ldt/security/command.py
--- a/src/ldt/ldt/security/command.py	Wed Oct 02 17:28:28 2013 +0200
+++ b/src/ldt/ldt/security/command.py	Tue Oct 08 18:03:22 2013 +0200
@@ -50,7 +50,7 @@
         total = list_model['User'].objects.count()
         
     for i, user in enumerate(list_model['User'].objects.all()):
-        everyone.user_set.add(user) 
+        user.groups.add(everyone)
         if verbose:
             writer = show_progress(i, total, "Assign permissions to groups", 40, writer)         
           
@@ -65,5 +65,5 @@
                 
     for admin in list_model['User'].objects.filter(is_superuser=True):
         for g in list_model['Group'].objects.all():
-            g.user_set.add(admin)
+            admin.groups.add(g)
             
\ No newline at end of file