From b153e16a0e34819cfdef16468e70adbb68ac8233 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 18 Dec 2012 11:38:15 -0300 Subject: fixed user search when groups are enabled --- askbot/templates/widgets/secondary_header.html | 2 +- askbot/views/users.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/askbot/templates/widgets/secondary_header.html b/askbot/templates/widgets/secondary_header.html index f0aca706..defd7148 100644 --- a/askbot/templates/widgets/secondary_header.html +++ b/askbot/templates/widgets/secondary_header.html @@ -6,7 +6,7 @@ {% if active_tab == "tags" %} action="{% url tags %}" {% elif active_tab == "users" %} - action="{% url users %}" + action="" {% else %} action="{% url questions %}" id="searchForm" {% endif %} diff --git a/askbot/views/users.py b/askbot/views/users.py index 5524ebd8..9102a6bc 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -61,7 +61,6 @@ def owner_or_moderator_required(f): def show_users(request, by_group=False, group_id=None, group_slug=None): """Users view, including listing of users by group""" - if askbot_settings.GROUPS_ENABLED and not by_group: default_group = models.Group.objects.get_global_group() group_slug = slugify(default_group.name) @@ -129,7 +128,7 @@ def show_users(request, by_group=False, group_id=None, group_slug=None): except ValueError: page = 1 - search_query = request.REQUEST.get('query', "") + search_query = request.GET.get('query', "") if search_query == "": if sortby == "newest": order_by_parameter = '-date_joined' -- cgit v1.2.3-1-g7c22