Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ability for staff users to moderate an article.

Browse Source
This commit is contained in:
Bridger Maxwell
2012-08-22 20:03:30 -04:00
parent a694d1034e
commit 9cd69e6ccd
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/envs/common.py
View File

@@ -318,7 +318,10 @@ WIKI_ACCOUNT_HANDLING = False
WIKI_EDITOR = 'course_wiki.editors.CodeMirror'
WIKI_SHOW_MAX_CHILDREN = 0 # We don't use the little menu that shows children of an article in the breadcrumb
WIKI_ANONYMOUS = False # Don't allow anonymous access until the styling is figured out
WIKI_CAN_CHANGE_PERMISSIONS = lambda article, user: user.has_perm('wiki.assign')
WIKI_CAN_CHANGE_PERMISSIONS = lambda article, user: user.is_staff or user.is_superuser
WIKI_CAN_ASSIGN = lambda article, user: user.is_staff or user.is_superuser
WIKI_USE_BOOTSTRAP_SELECT_WIDGET = False
################################# Jasmine ###################################
JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'

12
lms/templates/wiki/includes/article_menu.html
View File

@@ -1,5 +1,8 @@
## mako
<%! from django.core.urlresolvers import reverse %>
<%!
from django.core.urlresolvers import reverse
from wiki.core.permissions import can_change_permissions
%>
<li class="${"active" if selected_tab == "view" else ""}">
<a href="${reverse('wiki:get', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
@@ -37,9 +40,10 @@
<%doc>
The settings link has been disabled because the notifications app hasn't been integrated yet and those are the only useful settings.
This should be enabled for all non-anonymous users once the notifications app has been integrated and styled.
</%doc>
%if not user.is_anonymous():
%if can_change_permissions(article,user):
<li class="${"active" if selected_tab == "settings" else ""}">
<a href="${reverse('wiki:settings', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
<span class="icon-settings icon"></span>
@@ -47,6 +51,6 @@ The settings link has been disabled because the notifications app hasn't been in
</a>
</li>
%endif
</%doc>

2
repo-requirements.txt
View File

@@ -1,6 +1,6 @@
-e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
-e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
-e git://github.com/benjaoming/django-wiki.git@3576a2d#egg=django-wiki
-e git://github.com/benjaoming/django-wiki.git@50c08a3#egg=django-wiki
-e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e common/lib/capa
-e common/lib/xmodule