Changeset d1a4706

Timestamp:

Mar 31, 2012, 4:42:11 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

8708a86

Parents:

2ca19cb

git-author:

Alex Dehnert <adehnert@…> (03/31/12 04:42:11)

git-committer:

Alex Dehnert <adehnert@…> (03/31/12 04:42:11)

Message:

Make single result search go straight to DB entry

Resolves ASA Trac #85.

Location:

asadb

Files:

• groups/views.py (modified) (1 diff)
• template/groups/group_search.html (modified) (1 diff)

asadb/groups/views.py

@@ -764 +764 @@
         dest = reverse('groups:signatories')
         print dest
-    elif 'group-info' in request.GET:
+    elif 'group-goto' in request.GET:
+        if len(groups_filterset.qs) == 1:
+            group = groups_filterset.qs[0]
+            return redirect(reverse('groups:group-detail', kwargs={'pk':group.pk}))
+        else:
+            dest = reverse('groups:list')
+    elif 'group-list' in request.GET:
         dest = reverse('groups:list')
 

asadb/template/groups/group_search.html

@@ -10 +10 @@
     {{ filter.form.as_table }}
     </table>
-    <input type="submit" name="group-info" value="Show Group Information" />
+    <input type="submit" name="group-goto" value="Show Group Information" title="If exactly one group matches, go directly to that group's database entry. Otherwise, show the group list." />
+    <input type="submit" name="group-list" value="Show Group List" />
     {% if perms.groups.view_signatories %}
     <input type="submit" name="signatories" value="Show Signatories" />