diff --git a/group/templates/group/group_discus.html b/group/templates/group/group_discus.html index 12239961d8..f5f2829041 100644 --- a/group/templates/group/group_discus.html +++ b/group/templates/group/group_discus.html @@ -14,7 +14,7 @@
  • {% trans "Discussions" %}
  • {% trans "Wiki" %}
    • {% if is_staff %} -
  • {% trans "Admin" %}
    • +
  • {% trans "Admin" %}
    • {% endif %} diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index b01f2f924d..db84dcc8dc 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -14,7 +14,7 @@
  • {% trans "Discussions" %}
  • {% trans "Wiki" %}
    • {% if is_staff %} -
  • {% trans "Admin" %}
    • +
  • {% trans "Admin" %}
    • {% endif %} diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html index d36835246a..e3309fb130 100644 --- a/group/templates/group/group_manage.html +++ b/group/templates/group/group_manage.html @@ -5,7 +5,17 @@ {% block nav_group_class %}class="cur"{% endblock %} {% block title_panel %} -

    {{ group.group_name }} {% trans "administration"%}

    +
    + +
    + {% grp_avatar group.props.id 24 %} {{ group.group_name }} +
    +
    {% endblock %} {% block left_panel %} diff --git a/group/templates/group/group_wiki.html b/group/templates/group/group_wiki.html index ab8cdbc065..50bc8d3b24 100644 --- a/group/templates/group/group_wiki.html +++ b/group/templates/group/group_wiki.html @@ -12,9 +12,9 @@ diff --git a/group/urls.py b/group/urls.py index 87a32f9d5b..ec001595fe 100644 --- a/group/urls.py +++ b/group/urls.py @@ -16,7 +16,7 @@ urlpatterns = patterns('', url(r'^(?P\d+)/wiki_page_edit/(?P[^/]+)$', group_wiki_page_edit, name='group_wiki_page_edit'), url(r'^reply/(?P[\d]+)/$', msg_reply, name='msg_reply'), url(r'^reply/new/$', msg_reply_new, name='msg_reply_new'), - url(r'^(?P\d+)/manage/$', group_manage, name='group_members'), + url(r'^(?P\d+)/manage/$', group_manage, name='group_manage'), url(r'^(?P[\d]+)/create-repo/$', create_group_repo, name='create_group_repo'), (r'^(?P[\d]+)/member/(?P[^/]+)/$', group_member_operations), url(r'^(?P\d+)/msgdel/(?P\d+)/$', group_message_remove, name='group_message_remove'), diff --git a/group/views.py b/group/views.py index 9824953bfc..6082950297 100644 --- a/group/views.py +++ b/group/views.py @@ -483,12 +483,8 @@ def group_info(request, group_id): @login_required @ctx_switch_required @group_staff_required -def group_manage(request, group_id): - group_id = int(group_id) # Checked by URL Conf - - group = get_group(group_id) - if not group: - return HttpResponseRedirect(reverse('group_list', args=[])) +@group_check +def group_manage(request, group): user = request.user.username @@ -519,7 +515,7 @@ def group_manage(request, group_id): content_type=content_type) else: try: - ccnet_threaded_rpc.group_add_member(group_id, + ccnet_threaded_rpc.group_add_member(group.id, user, email) except SearpcError, e: result['error'] = _(e.msg) @@ -555,7 +551,7 @@ def group_manage(request, group_id): # Add user to group, unregistered user will see the group # when he logs in. try: - ccnet_threaded_rpc.group_add_member(group_id, + ccnet_threaded_rpc.group_add_member(group.id, user, email) except SearpcError, e: result['error'] = _(e.msg) @@ -571,7 +567,7 @@ def group_manage(request, group_id): content_type=content_type) # Add user to group. try: - ccnet_threaded_rpc.group_add_member(group_id, + ccnet_threaded_rpc.group_add_member(group.id, user, email) except SearpcError, e: result['error'] = _(e.msg) @@ -592,7 +588,7 @@ def group_manage(request, group_id): content_type=content_type) ### GET ### - members_all = ccnet_threaded_rpc.get_group_members(group_id) + members_all = ccnet_threaded_rpc.get_group_members(group.id) admins = [ m for m in members_all if m.is_staff ] contacts = Contact.objects.filter(user_email=user)