diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-12-21 15:42:10 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-12-21 15:42:10 -0600 |
commit | 132468e4afe0dd099730a85af8712e58fb788263 (patch) | |
tree | 7abb3e9c3c263eaa111172c0463cd12b0b04c459 | |
parent | 3f4c68f1886156571c7874bea6198935a4cb3825 (diff) | |
parent | b153e16a0e34819cfdef16468e70adbb68ac8233 (diff) | |
download | askbot-132468e4afe0dd099730a85af8712e58fb788263.tar.gz askbot-132468e4afe0dd099730a85af8712e58fb788263.tar.bz2 askbot-132468e4afe0dd099730a85af8712e58fb788263.zip |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
-rw-r--r-- | askbot/templates/widgets/secondary_header.html | 2 | ||||
-rw-r--r-- | 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' |