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

[group members] can be visited only when view_perm is not 'pub'

Browse Source
This commit is contained in:
llj
2013-04-01 13:50:17 +08:00
parent 225e5d7519
commit 9d74151d87
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,9 @@
<li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
<li class="tabnav-tab tabnav-tab-cur">{% trans "Discussion" %}</li> <li class="tabnav-tab tabnav-tab-cur">{% trans "Discussion" %}</li>
<li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
{% if group.view_perm != 'pub' %}
<li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
{% endif %}
{% if is_staff %} {% if is_staff %}
<li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
{% endif %} {% endif %}

4
group/templates/group/group_members.html
View File

@@ -32,9 +32,9 @@
<ul class="user-list"> <ul class="user-list">
{% for member in members %} {% for member in members %}
<li class="user ovhd"> <li class="user ovhd">
<a href="{{ SITE_ROOT }}profile/{{ member.user_name }}/" class="pic fleft">{% avatar member.user_name 48 %}</a> <a href="{{ SITE_ROOT }}profile/{{ member.user_name|email2id }}/" class="pic fleft">{% avatar member.user_name 48 %}</a>
<div class="txt fright"> <div class="txt fright">
<a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a> <a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name|email2id }}/">{{ member.user_name|email2nickname }}</a>
<p>{{ member.user_name }}</p> <p>{{ member.user_name }}</p>
{% if member.can_be_contact %} {% if member.can_be_contact %}
<button class="add-as-contact" data-email="{{ member.user_name }}">{% trans "Add as contact" %}</button> <button class="add-as-contact" data-email="{{ member.user_name }}">{% trans "Add as contact" %}</button>

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

@@ -16,7 +16,9 @@
<li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
<li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li> <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
{% if group.view_perm != 'pub' %}
<li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
{% endif %}
{% if is_staff %} {% if is_staff %}
<li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
{% endif %} {% endif %}

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

@@ -15,7 +15,9 @@
<li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
<li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li> <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
{% if group.view_perm != 'pub' %}
<li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
{% endif %}
{% if is_staff %} {% if is_staff %}
<li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li> <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
{% endif %} {% endif %}

3
group/views.py
View File

@@ -471,6 +471,9 @@ def group_info(request, group):
@group_check @group_check
def group_members(request, group): def group_members(request, group):
if group.view_perm == 'pub':
raise Http404
# Get all group members. # Get all group members.
members = get_group_members(group.id) members = get_group_members(group.id)