haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 14:21:23 +00:00
Code Issues Releases Wiki Activity

Modify group management page

Browse Source
This commit is contained in:
xiez
2012-09-28 10:47:51 +08:00
parent 658324e5c1
commit db2e9c228f
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contacts/templates/contacts/contact_list.html
View File

@@ -12,6 +12,7 @@
{% block right_panel %} {% block right_panel %}
<h3>站内联系人列表</h3> <h3>站内联系人列表</h3>
<button id="contact-add">添加联系人</button> <button id="contact-add">添加联系人</button>
{% if registered_contacts %}
<table> <table>
<tr> <tr>
<th width="4%"></th> <th width="4%"></th>
@@ -33,8 +34,13 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% else %}
<p>暂无</p>
{% endif %}
<h3>站外联系人列表</h3> <h3>站外联系人列表</h3>
{% if unregistered_contacts %}
<table> <table>
<tr> <tr>
<th width="4%"></th> <th width="4%"></th>
@@ -56,6 +62,9 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% else %}
<p>暂无</p>
{% endif %}
<form action="{% url contact_add_post %}" method="post" id="contact-add-form" class="hide"> <form action="{% url contact_add_post %}" method="post" id="contact-add-form" class="hide">
<h3>添加联系人</h3> <h3>添加联系人</h3>

2
group/templates/group/group_manage.html
View File

@@ -32,7 +32,7 @@
<td>{{ member.user_name }}</td> <td>{{ member.user_name }}</td>
<td> <td>
{% if not member.is_staff %} {% 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 %} {% endif %}
</td> </td>
</tr> </tr>

7
group/views.py
View File

@@ -493,7 +493,7 @@ def group_members(request, group_id):
return render_error(request, u'group id 不是有效参数') return render_error(request, u'group id 不是有效参数')
if not check_group_staff(group_id_int, request.user): if not check_group_staff(group_id_int, request.user):
return render_permission_error(request, u'只有群组管理员有权管理群组') raise Http404
group = get_group(group_id) group = get_group(group_id)
if not group: if not group:
@@ -602,15 +602,16 @@ def group_remove_member(request, group_id, user_name):
return render_error(request, u'group id 不是有效参数') return render_error(request, u'group id 不是有效参数')
if not check_group_staff(group_id_int, request.user): if not check_group_staff(group_id_int, request.user):
return render_permission_error(request, u'只有群组管理员有权删除成员') raise Http404
try: try:
ccnet_threaded_rpc.group_remove_member(group_id_int, ccnet_threaded_rpc.group_remove_member(group_id_int,
request.user.username, request.user.username,
user_name) user_name)
seafserv_threaded_rpc.remove_repo_group(group_id_int, user_name) seafserv_threaded_rpc.remove_repo_group(group_id_int, user_name)
messages.success(request, u'操作成功')
except SearpcError, e: except SearpcError, e:
return render_error(request, e.msg) messages.error(request, u'操作失败：%s' % e.msg)
return HttpResponseRedirect(reverse('group_members', args=[group_id])) return HttpResponseRedirect(reverse('group_members', args=[group_id]))