mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block."

Browse Source 
This reverts commit ebadb9b9a674f5e91ddb7460ea3f9dafc6c34523.
This commit is contained in:
Eloy Lafuente (stronk7) 2012-03-09 01:58:09 +01:00
parent 61b0512c44
commit d395ad7042
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/wiki/lang/en/wiki.php
View File

@ -22,10 +22,8 @@ $string['backoldversion'] = 'Back to old version';
$string['backpage'] = 'Back to page';
$string['backtomapmenu'] = 'Back to map menu';
$string['changerate'] = 'Do you wish to change it?';
$string['cannoteditpage'] = 'You can not edit this page.';
$string['cannotmanagefiles'] = 'You don\'t have permission to manage the wiki files.';
$string['cannotviewfiles'] = 'You don\'t have permission to view the wiki files.';
$string['cannotviewpage'] = 'You can not view this page.';
$string['comparesel'] = 'Compare selected';
$string['comments'] = 'Comments';
$string['commentscount'] = 'Comments ({$a})';

2
mod/wiki/lib.php
View File

@ -543,7 +543,7 @@ function wiki_extend_navigation(navigation_node $navref, $course, $module, $cm)
$node = $navref->add(get_string('view', 'wiki'), $link, navigation_node::TYPE_SETTING);
}
if (wiki_user_can_edit($subwiki)) {
if (has_capability('mod/wiki:editpage', $context)) {
$link = new moodle_url('/mod/wiki/edit.php', array('pageid' => $pageid));
$node = $navref->add(get_string('edit', 'wiki'), $link, navigation_node::TYPE_SETTING);
}

2
mod/wiki/locallib.php
View File

@ -764,7 +764,7 @@ function wiki_user_can_view($subwiki) {
// Each person owns a wiki.
if ($wiki->wikimode == 'collaborative' || $wiki->wikimode == 'individual') {
// Only members of subwiki group could view that wiki
if (groups_is_member($subwiki->groupid)) {
if ($subwiki->groupid == groups_get_activity_group($cm)) {
// Only view capability needed
return has_capability('mod/wiki:viewpage', $context);

10
mod/wiki/pagelib.php
View File

@ -172,6 +172,10 @@ abstract class page_wiki {
if (!$manage and !($edit and groups_is_member($currentgroup))) {
unset($this->tabs['edit']);
}
} else {
if (!has_capability('mod/wiki:editpage', $PAGE->context)) {
unset($this->tabs['edit']);
}
}
@ -320,7 +324,8 @@ class page_wiki_view extends page_wiki {
}
}
} else {
echo get_string('cannotviewpage', 'wiki');
// @TODO: Tranlate it
echo "You can not view this page";
}
}
@ -413,7 +418,8 @@ class page_wiki_edit extends page_wiki {
if (wiki_user_can_edit($this->subwiki)) {
$this->print_edit();
} else {
echo get_string('cannoteditpage', 'wiki');
// @TODO: Translate it
echo "You can not edit this page";
}
}