diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-06-03 15:43:41 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-06-03 15:43:41 -0400 |
| commit | cdde306208f13e05f944fdcb7c8fdd3ceaeb6bf3 (patch) | |
| tree | c242a0b088f91828e74a46bfea9dab0c140c45c4 | |
| parent | 53aab8b0c324a9bcb86903d075bf56cd7eb362dc (diff) | |
| parent | 82d5616a9fb27e6c1d0b5cc98fd90a923218fe06 (diff) | |
| download | askbot-cdde306208f13e05f944fdcb7c8fdd3ceaeb6bf3.tar.gz askbot-cdde306208f13e05f944fdcb7c8fdd3ceaeb6bf3.tar.bz2 askbot-cdde306208f13e05f944fdcb7c8fdd3ceaeb6bf3.zip | |
Merge branch 'kporangehat'
| -rw-r--r-- | askbot/templates/user_profile/user_info.html | 22 | ||||
| -rw-r--r-- | askbot/views/commands.py | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/askbot/templates/user_profile/user_info.html b/askbot/templates/user_profile/user_info.html index 95baad20..d328dc4e 100644 --- a/askbot/templates/user_profile/user_info.html +++ b/askbot/templates/user_profile/user_info.html @@ -60,17 +60,19 @@ <tr> <td>{% if user_groups %}{% trans %}groups{% endtrans %}{% endif %}</td> <td> - <table id="groups-list"> - {% for group in user_groups %} - <tr> - {{ macros.user_group(group, groups_membership_info[group.id]) }} - </tr> - {% endfor %} - </table> - <div class="clearfix"></div> - <a id="add-group">{% trans %}add group{% endtrans %}</a> + <div id="user-groups"> + <table id="groups-list"> + {% for group in user_groups %} + <tr> + {{ macros.user_group(group, groups_membership_info[group.id]) }} + </tr> + {% endfor %} + </table> + <div class="clearfix"></div> + <a id="add-group">{% trans %}add group{% endtrans %}</a> + </div> </td> - </div> + </tr> {% endif %} <tr> <td>{% trans %}member since{% endtrans %}</td> diff --git a/askbot/views/commands.py b/askbot/views/commands.py index b2c8a788..1ffc6d23 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -1034,12 +1034,12 @@ def edit_group_membership(request): template = get_template('widgets/group_snippet.html') return { 'name': group.name, - 'description': getattr(group.tag_wiki, 'text', ''), + 'description': getattr(group.description, 'text', ''), 'html': template.render({'group': group}) } elif action == 'remove': try: - group = models.Group.objects.get(group_name = group_name) + group = models.Group.objects.get(name = group_name) request.user.edit_group_membership(user, group, 'remove') except models.Group.DoesNotExist: raise exceptions.PermissionDenied() |