Add searchbar for groups
authorverrierj
Fri, 16 Dec 2011 16:42:08 +0100
changeset 291 bd1c08c872ac
parent 290 e1980a7d4b83
child 292 48d9e8297287
Add searchbar for groups
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html
src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html
src/ldt/ldt/ldt_utils/views.py
--- 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 @@
 <div class="span-24 last" id="allcontentsdiv">
 	<div class="span-12" id="contentsdiv">
 	    <div class="span-12 last titlediv" >
-			<div class="span-8 projectscontentstitle">{% trans "My groups" %}</div>
+			<div class="span-8 projectscontentstitle">{% trans "My groups" %}
+			{% if can_add_group %}
+				<a class="create_group" href="{% url ldt.ldt_utils.views.create_group %}"><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/film_add.png" alt="{% trans 'Create group' %}" title="{% trans 'Create group' %}" /></a>
+			{% endif %}
+			</div>
 			<div class="span-4 last searchfielddiv" >
-				{% if can_add_group %}
-				<a class="create_group" href="{% url ldt.ldt_utils.views.create_group %}"><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/film_add.png" alt="{% trans 'Create group' %}" title="{% trans 'Create group' %}" /></a>
-				{% endif %}
+				
+				<div class="span-4 last searchfielddiv" >
+			    	<div class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+				</div>
 			</div>
 		</div>
 		<div class="span-12 last projectscontentsdiv" id="groupslistcontainer">
--- 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 @@
 		
 		<td class="align_right"><img src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" class="next_icon"/></td>
 		
-		</tr>
+	</tr>
 	{% endfor %}
-	{% if not user.is_superuser %}
+	
+	{% if not user.is_superuser and not search_active %}
 	<tr class="imageline {% cycle color_cycle %} update_group_projects" id="-1">  
 			<td class="cellimg"></td>
 			<td>{% trans "Projects shared with me only" %}</td>
--- 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))