diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-09-03 10:49:46 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-09-03 10:49:46 -0400 |
commit | c66ee4e94db3df1067cb484b1c9f8e4445600e3c (patch) | |
tree | 588fa787b03d2ccc7ab1dbf41599afdcafe780e0 /askbot/views/users.py | |
parent | 8715bc86f3bd6b908217f3600681a6793850a72b (diff) | |
download | askbot-c66ee4e94db3df1067cb484b1c9f8e4445600e3c.tar.gz askbot-c66ee4e94db3df1067cb484b1c9f8e4445600e3c.tar.bz2 askbot-c66ee4e94db3df1067cb484b1c9f8e4445600e3c.zip |
added UI to set group openness and prepared ground for "ask to join" function
Diffstat (limited to 'askbot/views/users.py')
-rw-r--r-- | askbot/views/users.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/askbot/views/users.py b/askbot/views/users.py index 031c1003..050f8ad2 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -163,14 +163,18 @@ def show_users(request, by_group=False, group_id=None, group_slug=None): } paginator_context = functions.setup_paginator(paginator_data) # + #todo: move to contexts + #extra context for the groups if askbot_settings.GROUPS_ENABLED: #todo: cleanup this branched code after groups are migrated to auth_group user_groups = get_groups().exclude(name__startswith='_internal_') if len(user_groups) <= 1: assert(user_groups[0].name == askbot_settings.GLOBAL_GROUP_NAME) user_groups = None + group_openness_choices = models.Group().get_openness_choices() else: user_groups = None + group_openness_choices = None data = { 'active_tab': 'users', @@ -183,7 +187,8 @@ def show_users(request, by_group=False, group_id=None, group_slug=None): 'group_email_moderation_enabled': group_email_moderation_enabled, 'user_can_join_group': user_can_join_group, 'user_is_group_member': user_is_group_member, - 'user_groups': user_groups + 'user_groups': user_groups, + 'group_openness_choices': group_openness_choices } return render_into_skin('users.html', data, request) |