Improve group manage page

group/error_msg.py

@@ -16,3 +16,9 @@ msg = _("Permission error: only group staff can add member")
 msg = _("Group not exists")
 msg = _("Group is full")
 msg = _("Failed to add member to group")
+
+# group_remove_member rpc
+msg = _("Only group staff can remove member")
+msg = _("Group not exists")
+msg = _("Can not remove myself")
+

group/locale/zh_CN/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-20 14:58+0800\n"
+"POT-Creation-Date: 2012-10-20 16:28+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "创建团体群组失败。"
 msgid "Permission error: only group staff can add member"
 msgstr "只有群组管理员可以添加成员。"
 
-#: error_msg.py:16
+#: error_msg.py:16 error_msg.py:22
 msgid "Group not exists"
 msgstr "群组不存在。"
 
@@ -50,21 +50,29 @@ msgstr "群组已满，无法再添加成员。"
 msgid "Failed to add member to group"
 msgstr "添加成员失败。"
 
-#: views.py:705
+#: error_msg.py:21
+msgid "Only group staff can remove member"
+msgstr "只有群组管理员可以删除成员。"
+
+#: error_msg.py:23
+msgid "Can not remove myself"
+msgstr "无法删除自己"
+
+#: views.py:761
 msgid "Recommend error: wrong group id"
 msgstr "推荐失败：群组id不正确"
 
-#: views.py:713
+#: views.py:769
 #, python-format
 msgid "Recommend to %s error: you are not in that group"
 msgstr "推荐到 %s 失败：未参加该群组"
 
-#: views.py:733
+#: views.py:789
 #, python-format
 msgid ""
 "Recommend to <a href=\"%(url)s\" target=\"_blank\">%(name)s</a> success。"
 msgstr "推荐到<a href=\"%(url)s\" target=\"_blank\">%(name)s</a>成功"
 
-#: views.py:738
+#: views.py:794
 msgid "Recommend failed"
 msgstr "推荐失败"

group/templates/group/group_manage.html

@@ -18,9 +18,8 @@
 {% endblock %}
 
 {% block right_panel %}
-<h3>群组成员列表</h3>
+<h3>成员列表</h3>
 <button id="group-member-add">添加成员</button>
-<button id="group-admin-add">添加管理员</button>
 {% if members %}
 <table class="member-list">
     <tr>
@@ -41,6 +40,30 @@
 <p>暂无</p>
 {% endif %}
 
+<h3>管理员列表</h3>
+<button id="group-admin-add">添加管理员</button>
+{% if admins %}
+<table class="member-list">
+    <tr>
+        <th width="75%">邮箱</th>
+        <th width="25%">操作</th>
+    </tr>
+
+    {% for member in admins %}
+    <tr>
+        <td>{{ member.user_name }}</td>
+        <td>
+            {% if member.user_name != request.user.username %}
+            <a href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/member/{{ member.user_name }}/?op=delete" class="member-remove-btn op">删除</a>
+            {% endif %}
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+{% else %}
+<p>暂无</p>
+{% endif %}
+
 {% include 'group/grpmember_add_form.html' %}
 
 {% endblock %}
@@ -49,7 +72,7 @@
 <script type="text/javascript">
 addConfirmTo($("#group-remove"), '确定要解散该群组吗？');
 
-addConfirmTo($(".member-remove-btn"), '确定要删除该成员？');
+addConfirmTo($(".member-remove-btn"));
 
 var contact_list = [], contact_email;
 {% for contact in contacts %}

group/views.py

@@ -611,12 +611,19 @@ def group_members(request, group_id):
                             content_type=content_type)
 
     ### GET ###
-    members = ccnet_threaded_rpc.get_group_members(group_id_int)
+    members_all = ccnet_threaded_rpc.get_group_members(group_id_int)
+    members, admins = [], []
+    for m in members_all:
+        if m.is_staff:
+            admins.append(m)
+        else:
+            members.append(m)
     contacts = Contact.objects.filter(user_email=request.user.username)
 
     return render_to_response('group/group_manage.html', {
             'group' : group,
             'members': members,
+            'admins': admins,
             'contacts': contacts,
             }, context_instance=RequestContext(request))
 
@@ -690,7 +697,7 @@ def group_remove_member(request, group_id, user_name):
         seafserv_threaded_rpc.remove_repo_group(group_id_int, user_name)
         messages.success(request, u'操作成功')
     except SearpcError, e:
-        messages.error(request, u'操作失败：%s' % e.msg)
+        messages.error(request, u'操作失败：%s' % _(e.msg))
 
     return HttpResponseRedirect(reverse('group_members', args=[group_id]))