mirror of
https://github.com/moodle/moodle.git
synced 2025-08-10 11:26:41 +02:00
MDL-30478 - wiki - Fixing up group problems when viewing and creating wiki pages.
Thanks to Matt Kolb for his contribution.
This commit is contained in:
parent
ead4f180a0
commit
5dedd64d58
4 changed files with 69 additions and 19 deletions
|
@ -31,7 +31,7 @@ $action = optional_param('action', 'new', PARAM_TEXT);
|
|||
$title = optional_param('title', get_string('newpage', 'wiki'), PARAM_TEXT);
|
||||
$wid = optional_param('wid', 0, PARAM_INT);
|
||||
$swid = optional_param('swid', 0, PARAM_INT);
|
||||
$gid = optional_param('gid', 0, PARAM_INT);
|
||||
$group = optional_param('group', 0, PARAM_INT);
|
||||
$uid = optional_param('uid', 0, PARAM_INT);
|
||||
|
||||
// 'create' action must be submitted by moodle form
|
||||
|
@ -50,7 +50,7 @@ if (!empty($swid)) {
|
|||
}
|
||||
|
||||
} else {
|
||||
$subwiki = wiki_get_subwiki_by_group($wid, $gid, $uid);
|
||||
$subwiki = wiki_get_subwiki_by_group($wid, $group, $uid);
|
||||
|
||||
if (!$wiki = wiki_get_wiki($wid)) {
|
||||
print_error('invalidwikiid', 'wiki');
|
||||
|
@ -62,6 +62,26 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
|
|||
print_error('invalidcoursemoduleid', 'wiki');
|
||||
}
|
||||
|
||||
$groups = new stdClass();
|
||||
if (groups_get_activity_groupmode($cm)) {
|
||||
$modulecontext = get_context_instance(CONTEXT_MODULE, $cm->id);
|
||||
$canaccessgroups = has_capability('moodle/site:accessallgroups', $modulecontext);
|
||||
if ($canaccessgroups) {
|
||||
$groups->availablegroups = groups_get_all_groups($cm->course);
|
||||
$allpart = new stdClass();
|
||||
$allpart->id = '0';
|
||||
$allpart->name = get_string('allparticipants');
|
||||
array_unshift($groups->availablegroups, $allpart);
|
||||
} else {
|
||||
$groups->availablegroups = groups_get_all_groups($cm->course, $USER->id);
|
||||
}
|
||||
if (!empty($group)) {
|
||||
$groups->currentgroup = $group;
|
||||
} else {
|
||||
$groups->currentgroup = groups_get_activity_group($cm);
|
||||
}
|
||||
}
|
||||
|
||||
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
|
||||
|
||||
require_login($course->id, true, $cm);
|
||||
|
@ -74,10 +94,11 @@ if (!empty($swid)) {
|
|||
$wikipage->set_swid($swid);
|
||||
} else {
|
||||
$wikipage->set_wid($wid);
|
||||
$wikipage->set_gid($gid);
|
||||
$wikipage->set_gid($group);
|
||||
$wikipage->set_uid($uid);
|
||||
}
|
||||
|
||||
$wikipage->set_availablegroups($groups);
|
||||
$wikipage->set_title($title);
|
||||
|
||||
// set page action, and initialise moodle form
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue