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

Fixed public group wiki bug

Browse Source
This commit is contained in:
zhengxie
2013-04-01 14:15:20 +08:00
parent bb35aa7577
commit 6517ede4e5
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,9 @@
<ul class="wiki-nav fleft"> <ul class="wiki-nav fleft">
<li class="item"><a href="{% url 'group_wiki' group.id %}" class="link">{% trans "Home" %}</a></li> <li class="item"><a href="{% url 'group_wiki' group.id %}" class="link">{% trans "Home" %}</a></li>
<li class="item"><a href="{% url 'group_wiki_pages' group.id %}" class="link">{% trans "Pages" %}</a></li> <li class="item"><a href="{% url 'group_wiki_pages' group.id %}" class="link">{% trans "Pages" %}</a></li>
{% if group.view_perm != "pub" %}
<li class="item"><a href="{% url 'repo_history' repo_id %}" target="_blank" class="link">{% trans "Wiki History" %}</a></li> <li class="item"><a href="{% url 'repo_history' repo_id %}" target="_blank" class="link">{% trans "Wiki History" %}</a></li>
{% endif %}
</ul> </ul>
{% if group.view_perm != "pub" %} {% if group.view_perm != "pub" %}

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

@@ -28,7 +28,9 @@
<ul class="wiki-nav fleft"> <ul class="wiki-nav fleft">
<li class="item"><a href="{% url 'group_wiki' group.id %}" class="link">{% trans "Home" %}</a></li> <li class="item"><a href="{% url 'group_wiki' group.id %}" class="link">{% trans "Home" %}</a></li>
<li class="item"><a href="{% url 'group_wiki_pages' group.id %}" class="link">{% trans "Pages" %}</a></li> <li class="item"><a href="{% url 'group_wiki_pages' group.id %}" class="link">{% trans "Pages" %}</a></li>
{% if group.view_perm != "pub" %}
<li class="item"><a href="{% url 'repo_history' repo_id %}" target="_blank" class="link">{% trans "Wiki History" %}</a></li> <li class="item"><a href="{% url 'repo_history' repo_id %}" target="_blank" class="link">{% trans "Wiki History" %}</a></li>
{% endif %}
</ul> </ul>
{% if group.view_perm != "pub" %} {% if group.view_perm != "pub" %}
<button id="page-create" class="op-btn">{% trans "New Page" %}</button> <button id="page-create" class="op-btn">{% trans "New Page" %}</button>

5
group/views.py
View File

@@ -1194,7 +1194,10 @@ def group_wiki(request, group, page_name="home"):
except WikiDoesNotExist: except WikiDoesNotExist:
wiki_exists = False wiki_exists = False
except WikiPageMissing: except WikiPageMissing:
'''create that page for user''' '''create that page for user if he/she is a group member'''
if not is_group_user(group.id, username):
raise Http404
repo = find_wiki_repo(request, group) repo = find_wiki_repo(request, group)
# No need to check whether repo is none, since repo is already created # No need to check whether repo is none, since repo is already created