From db2e9c228fbb8ce4c44c796f6e5781784dc84d11 Mon Sep 17 00:00:00 2001
From: xiez <xiez1989@gmail.com>
Date: Fri, 28 Sep 2012 10:47:51 +0800
Subject: [PATCH] Modify group management page

---
 contacts/templates/contacts/contact_list.html | 9 +++++++++
 group/templates/group/group_manage.html       | 2 +-
 group/views.py                                | 9 +++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/contacts/templates/contacts/contact_list.html b/contacts/templates/contacts/contact_list.html
index b452c221b7..73bda74f1e 100644
--- a/contacts/templates/contacts/contact_list.html
+++ b/contacts/templates/contacts/contact_list.html
@@ -12,6 +12,7 @@
 {% block right_panel %}
 <h3>站内联系人列表</h3>
 <button id="contact-add">添加联系人</button>
+{% if registered_contacts %}
 <table>
     <tr>
         <th width="4%"></th>
@@ -33,8 +34,13 @@
     </tr>
 {% endfor %}
 </table>
+{% else %}
+<p>暂无</p>
+{% endif %}
+
 
 <h3>站外联系人列表</h3>
+{% if unregistered_contacts %}
 <table>
     <tr>
         <th width="4%"></th>
@@ -56,6 +62,9 @@
     </tr>
 {% endfor %}
 </table>
+{% else %}
+<p>暂无</p>
+{% endif %}
 
 <form action="{% url contact_add_post %}" method="post" id="contact-add-form" class="hide">
     <h3>添加联系人</h3>
diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index 8619a3ba06..8fe0851f52 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -32,7 +32,7 @@
         <td>{{ member.user_name }}</td>
         <td>
         {% if not member.is_staff %}
-            <button data="{{ SITE_ROOT }}group/{{ group.id }}/member/{{ member.user_name }}/?op=delete" class="member-remove-btn">删除</button>
+            <a href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/member/{{ member.user_name }}/?op=delete" class="member-remove-btn op">删除</a>
         {% endif %}
         </td>
     </tr>
diff --git a/group/views.py b/group/views.py
index 8b120e8eae..01a226db06 100644
--- a/group/views.py
+++ b/group/views.py
@@ -493,7 +493,7 @@ def group_members(request, group_id):
         return render_error(request, u'group id 不是有效参数')        
 
     if not check_group_staff(group_id_int, request.user):
-        return render_permission_error(request, u'只有群组管理员有权管理群组')
+        raise Http404
 
     group = get_group(group_id)
     if not group:
@@ -602,15 +602,16 @@ def group_remove_member(request, group_id, user_name):
         return render_error(request, u'group id 不是有效参数')        
     
     if not check_group_staff(group_id_int, request.user):
-        return render_permission_error(request, u'只有群组管理员有权删除成员')
-    
+        raise Http404
+
     try:
         ccnet_threaded_rpc.group_remove_member(group_id_int,
                                                request.user.username,
                                                user_name)
         seafserv_threaded_rpc.remove_repo_group(group_id_int, user_name)
+        messages.success(request, u'操作成功')
     except SearpcError, e:
-        return render_error(request, e.msg)
+        messages.error(request, u'操作失败：%s' % e.msg)
 
     return HttpResponseRedirect(reverse('group_members', args=[group_id]))