summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/urls.py4
-rw-r--r--askbot/views/users.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/askbot/urls.py b/askbot/urls.py
index 799cc346..869f7d69 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -246,12 +246,12 @@ urlpatterns = patterns('',
),
url(
r'^%s$' % _('users/'),
- views.users.users,
+ views.users.show_users,
name='users'
),
url(
r'^%s%s(?P<group_id>\d+)/(?P<group_slug>.*)/$' % (_('users/'), _('by-group/')),
- views.users.users,
+ views.users.show_users,
kwargs = {'by_group': True},
name = 'users_by_group'
),
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 8bc2909d..0ebfb936 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -56,7 +56,7 @@ def owner_or_moderator_required(f):
return f(request, profile_owner, context)
return wrapped_func
-def users(request, by_group = False, group_id = None, group_slug = None):
+def show_users(request, by_group = False, group_id = None, group_slug = None):
"""Users view, including listing of users by group"""
users = models.User.objects.exclude(status = 'b')
group = None