bugfixes

3 files changed, 12 insertions, 8 deletions

diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 6c6bb270..6fc7eef5 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -53,16 +53,18 @@ def get_admins_and_moderators():
         models.Q(is_superuser=True) | models.Q(status='m')
     )
 
-def get_users_by_text_query(search_query):
+def get_users_by_text_query(search_query, users_query_set = None):
     """Runs text search in user names and profile.
     For postgres, search also runs against user group names.
     """
     import askbot
+    if users_query_set is None:
+        users_query_set = User.objects.all()
     if 'postgresql_psycopg2' in askbot.get_database_engine_name():
         from askbot.search import postgresql
-        return postgresql.run_full_text_search(User.objects.all(), search_query)
+        return postgresql.run_full_text_search(users_query_set, search_query)
     else:
-        return User.objects.filter(
+        return users_query_set.filter(
             models.Q(username__icontains=search_query) |
             models.Q(about__icontains=search_query)
         )
diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html
index 2603ec31..093283f8 100644
--- a/askbot/skins/default/templates/meta/bottom_scripts.html
+++ b/askbot/skins/default/templates/meta/bottom_scripts.html
@@ -25,7 +25,7 @@
     {% if settings.DEBUG %}
         src="{{"/js/jquery-1.7.2.min.js"|media}}"
     {% else %}
-        src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"
+        src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
     {% endif %}
 ></script>
 <!-- History.js --> 
diff --git a/askbot/views/users.py b/askbot/views/users.py
index d8e0fb6e..a536b79e 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -70,6 +70,8 @@ def users(request, by_group = False, group_id = None, group_slug = None):
             if all((group_id, group_slug)) == False:
                 return HttpResponseRedirect('groups')
             else:
+                import pdb
+                pdb.set_trace()
                 try:
                     group = models.Tag.group_tags.get(id = group_id)
                     group_email_moderation_enabled = \
@@ -81,12 +83,12 @@ def users(request, by_group = False, group_id = None, group_slug = None):
                 except models.Tag.DoesNotExist:
                     raise Http404
                 if group_slug == slugify(group.name):
-                    group_users = models.User.objects.filter(
+                    users = models.User.objects.filter(
                         group_memberships__group__id = group_id
                     )
                     if request.user.is_authenticated():
                         user_is_group_member = bool(
-                                                    group_users.filter(
+                                                    users.filter(
                                                         id = request.user.id
                                                     ).count()
                                                 )
@@ -125,13 +127,13 @@ def users(request, by_group = False, group_id = None, group_slug = None):
             order_by_parameter = '-reputation'
 
         objects_list = Paginator(
-                            models.User.objects.order_by(order_by_parameter),
+                            users.order_by(order_by_parameter),
                             const.USERS_PAGE_SIZE
                         )
         base_url = request.path + '?sort=%s&' % sortby
     else:
         sortby = "reputation"
-        matching_users = models.get_users_by_text_query(search_query)
+        matching_users = models.get_users_by_text_query(search_query, users)
         objects_list = Paginator(
                             matching_users.order_by('-reputation'),
                             const.USERS_PAGE_SIZE