# HG changeset patch # User verrierj # Date 1324050128 -3600 # Node ID bd1c08c872acc7b7ce0690f7aebd8b2cde4964c3 # Parent e1980a7d4b837fb7a72ef153fecc653da02eb4d6 Add searchbar for groups diff -r e1980a7d4b83 -r bd1c08c872ac src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Fri Dec 16 16:18:25 2011 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Fri Dec 16 16:42:08 2011 +0100 @@ -26,8 +26,10 @@ $(document).ready(function(){ input_list_init = [ - {'input_selector':"#searchprojectsinput", 'container_selector':"#projectslistcontainer", 'url':project_filter_url} + {'input_selector':"#searchprojectsinput", 'container_selector':"#projectslistcontainer", 'url':project_filter_url}, + {'input_selector':"#searchgroupsinput", 'container_selector':"#groupslistcontainer", 'url':groups_filter_url}, ]; + searchFieldInit(input_list_init); @@ -84,11 +86,16 @@
-
{% trans "My groups" %}
+
{% trans "My groups" %} + {% if can_add_group %} + {% trans 'Create group' %} + {% endif %} +
- {% if can_add_group %} - {% trans 'Create group' %} - {% endif %} + +
+
loader
+
diff -r e1980a7d4b83 -r bd1c08c872ac src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Fri Dec 16 16:18:25 2011 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Fri Dec 16 16:42:08 2011 +0100 @@ -20,9 +20,10 @@ - + {% endfor %} - {% if not user.is_superuser %} + + {% if not user.is_superuser and not search_active %} {% trans "Projects shared with me only" %} diff -r e1980a7d4b83 -r bd1c08c872ac src/ldt/ldt/ldt_utils/views.py --- a/src/ldt/ldt/ldt_utils/views.py Fri Dec 16 16:18:25 2011 +0100 +++ b/src/ldt/ldt/ldt_utils/views.py Fri Dec 16 16:42:08 2011 +0100 @@ -222,16 +222,19 @@ filter = filter[1:] if filter: - group_list = request.user.groups.filter(title__icontains=filter) + group_list = request.user.groups.filter(name__icontains=filter) + search_active = True else: group_list = request.user.groups.all() + search_active = False group_list = group_list.exclude(name=settings.PUBLIC_GROUP_NAME) group_list = sorted(group_list.all(), key=lambda group: group.name.lower()) group_list = add_change_attr(request.user, group_list) + return render_to_response("ldt/ldt_utils/partial/groupslist.html", - {'groups': group_list}, + {'groups': group_list, 'search_active': search_active}, context_instance=RequestContext(request))