Merge pull request #63 from futurice/search-field-fix

Search field fix

Author: mixman

fum/api/views.py

@@ -159,7 +159,10 @@ def mod_groups(request, user, usergroups, classname):
         elif request.method == 'POST':
             for group in groups:
                 if user not in group.users.all():
-                    group.users.add(user)
+                    try:
+                        group.users.add(user)
+                    except ValidationError as e:
+                        return Response(e.messages, status=status.HTTP_400_BAD_REQUEST)
 
     json_groups = []
     for group in usergroups.all().values().order_by():

fum/common/static/js/marcopolo2.js

@@ -21,6 +21,7 @@ function marcopoloField2(el, opt){
       err = err.responseText;
     };
     fumErrors.set('marcopolo', err, 'error');
+    $.getJSON(apiUrl, updateTable);
   }
 
   var delicon = '<i class="icon-remove pull-right"></i>';

fum/groups/views.py

@@ -72,6 +72,7 @@ def groups_json(request):
     user = Users.objects.get(username=request.META['REMOTE_USER'])
     try:
         q = request.GET['q']
+        q = q.strip()
         filtered = Groups.objects.filter(name__icontains=q) 
         groups = [] 
         for group in filter_by_permissions(request, user, filtered.distinct()):

fum/projects/views.py

@@ -70,6 +70,7 @@ def projects_json(request):
     user = Users.objects.get(username = request.META['REMOTE_USER'])
     try:
         q = request.GET['q']
+        q = q.strip()
         filtered = Projects.objects.filter(name__icontains=q) 
         projects = [] 
         for project in filter_by_permissions(request, user, filtered.distinct()):

fum/servers/views.py

@@ -71,6 +71,7 @@ def servers_json(request):
     user = Users.objects.get(username = request.META['REMOTE_USER'])
     try:
         q = request.GET['q']
+        q = q.strip()
         filtered = Servers.objects.filter(name__icontains=q) 
         servers = [] 
         for server in filter_by_permissions(request, user, filtered.distinct()):

fum/users/views.py

@@ -53,7 +53,12 @@ def get_success_url(self):
 def users_json(request):
     try:
         q = request.GET['q']
-        filtered = Users.objects.filter(Q(first_name__icontains=q) | Q(last_name__icontains=q) | Q(username__icontains=q)) 
+        search_terms = q.split()
+
+        filtered = Users.objects
+        for word in search_terms:
+            filtered = filtered.filter(Q(first_name__icontains=word) | Q(last_name__icontains=word) | Q(username__icontains=word)) 
+        
         users = [] 
         for user in filtered.distinct():
             json_user={}