diff options
| -rw-r--r-- | askbot/skins/default/templates/widgets/meta_nav.html | 13 | ||||
| -rw-r--r-- | askbot/tests/page_load_tests.py | 5 | ||||
| -rw-r--r-- | askbot/views/users.py | 11 |
3 files changed, 22 insertions, 7 deletions
diff --git a/askbot/skins/default/templates/widgets/meta_nav.html b/askbot/skins/default/templates/widgets/meta_nav.html index 1b28c787..077e781e 100644 --- a/askbot/skins/default/templates/widgets/meta_nav.html +++ b/askbot/skins/default/templates/widgets/meta_nav.html @@ -3,18 +3,19 @@ href="{% url tags %}" {% if active_tab == 'tags' %}class="on"{% endif %} >{% trans %}tags{% endtrans %}</a> -<a - id="navUsers" - href="{% url users %}" - {% if active_tab == 'users' %}class="on"{% endif %} ->{% trans %}users{% endtrans %}</a> {% if settings.GROUPS_ENABLED %} <a id="navGroups" href="{% url groups %}" {% if active_tab == 'groups' %}class="on"{% endif %} ->{% trans %}groups{% endtrans %} +>{% trans %}people & groups{% endtrans %} </a> +{%else%} +<a + id="navUsers" + href="{% url users %}" + {% if active_tab == 'users' %}class="on"{% endif %} +>{% trans %}users{% endtrans %}</a> {% endif %} {% if settings.BADGES_MODE == 'public' %} <a diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py index 7d833339..f3e10c1e 100644 --- a/askbot/tests/page_load_tests.py +++ b/askbot/tests/page_load_tests.py @@ -519,6 +519,11 @@ class PageLoadTestCase(AskbotTestCase): template='user_profile/user_inbox.html', ) + def test_user_page_with_groups_enabled(self): + askbot_settings.GROUPS_ENABLED = True + self.try_url('users', status_code=302) + askbot_settings.GROUPS_ENABLED = False + self.try_url('users', status_code=200) class AvatarTests(AskbotTestCase): diff --git a/askbot/views/users.py b/askbot/views/users.py index c0a3a295..e06b3092 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -59,6 +59,15 @@ 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 = get_global_group() + group_slug = slugify(default_group.name) + new_url = reverse('users_by_group', + kwargs={'group_id': default_group.id, + 'group_slug': group_slug}) + return HttpResponseRedirect(new_url) + users = models.User.objects.exclude(status = 'b') group = None group_email_moderation_enabled = False @@ -386,7 +395,7 @@ def user_stats(request, user, context): interesting_tag_names = None ignored_tag_names = None subscribed_tag_names = None - + # tags = models.Post.objects.filter(author=user).values('id', 'thread', 'thread__tags') # post_ids = set() # thread_ids = set() |