mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-58140 completion: access control refinements

Browse Source 
Part of MDL-58138 epic
This commit is contained in:
Marina Glancy 2017-03-14 10:24:06 +08:00 committed by Jake Dallimore
parent 6e60511953
commit 0cbc248dd3
9 changed files with 114 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
completion/classes/manager.php
View File

@ -65,26 +65,47 @@ class manager {
$sectionobject = new stdClass();
$sectionobject->sectionnumber = $sectionnumber;
$sectionobject->name = get_section_name($this->courseid, $sectioninfo);
$sectionobject->activities = [];
foreach ($section as $cmid) {
$mod = $moduleinfo->get_cm($cmid);
$moduleobject = new stdClass();
$moduleobject->cmid = $cmid;
$moduleobject->modname = $mod->get_formatted_name();
$moduleobject->icon = $mod->get_icon_url()->out();
$moduleobject->url = $mod->url;
// Get activity completion information.
$moduleobject->completionstatus = $this->get_completion_detail($mod);
$sectionobject->activities[] = $moduleobject;
}
$data->sections[] = $sectionobject;
$activitiesdata = $this->get_activities($section, true);
$sectionobject->activities = $activitiesdata->activities;
$data->sections[] = $sectionobject;
}
return $data;
}
/**
* Gets the data (context) to be used with the activityinstance template
*
* @param array $cmids list of course module ids
* @param bool $withcompletiondetails include completion details
* @return \stdClass
*/
public function get_activities($cmids, $withcompletiondetails = false) {
$moduleinfo = get_fast_modinfo($this->courseid);
$activities = [];
foreach ($cmids as $cmid) {
$mod = $moduleinfo->get_cm($cmid);
if (!$mod->uservisible) {
continue;
}
$moduleobject = new stdClass();
$moduleobject->cmid = $cmid;
$moduleobject->modname = $mod->get_formatted_name();
$moduleobject->icon = $mod->get_icon_url()->out();
$moduleobject->url = $mod->url;
$moduleobject->canmanage = $withcompletiondetails && self::can_edit_bulk_completion($this->courseid, $mod);
// Get activity completion information.
if ($moduleobject->canmanage) {
$moduleobject->completionstatus = $this->get_completion_detail($mod); // This is a placeholder only. Must be replaced later.
} else {
$moduleobject->completionstatus = ['icon' => null, 'string' => null];
}
$activities[] = $moduleobject;
}
return (object)['activities' => $activities];
}
private function get_completion_detail(\cm_info $mod) {
global $OUTPUT;
$strings = [];
@ -137,4 +158,27 @@ class manager {
return $data;
}
/**
* Checks if current user can edit activity completion
*
* @param int|stdClass $courseorid
* @param \cm_info|null $cm if specified capability for a given coursemodule will be check,
* if not specified capability to edit at least one activity is checked.
*/
public static function can_edit_bulk_completion($courseorid, $cm = null) {
if ($cm) {
return $cm->uservisible && has_capability('moodle/course:manageactivities', $cm->context);
}
$coursecontext = context_course::instance(is_object($courseorid) ? $courseorid->id : $courseorid);
if (has_capability('moodle/course:manageactivities', $coursecontext)) {
return true;
}
$modinfo = get_fast_modinfo($courseorid);
foreach ($modinfo->cms as $mod) {
if ($mod->uservisible && has_capability('moodle/course:manageactivities', $mod->context)) {
return true;
}
}
return false;
}
}

7
course/bulkcompletion.php
View File

@ -43,7 +43,6 @@ if ($id) {
print_error('invalidcourseid');
}
require_login($course);
require_capability('moodle/course:update', context_course::instance($course->id));
} else {
require_login();
@ -51,6 +50,7 @@ if ($id) {
}
// Set up the page.
navigation_node::override_active_url(new moodle_url('/course/completion.php', array('id' => $course->id)));
$PAGE->set_course($course);
$PAGE->set_url('/course/bulkcompletion.php', array('id' => $course->id));
$PAGE->set_title($course->shortname);
@ -58,6 +58,11 @@ $PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('admin');
// Get all that stuff I need for the renderer.
if (!core_completion\manager::can_edit_bulk_completion($id)) {
throw new required_capability_exception(context_course::instance($course->id),
'moodle/course:manageactivities', 'nopermission');
}
$manager = new \core_completion\manager($id);
$bulkcompletiondata = $manager->get_activities_and_headings();

44
course/classes/output/bulk_activity_completion_renderer.php
View File

@ -38,25 +38,33 @@ class core_course_bulk_activity_completion_renderer extends plugin_renderer_base
public function navigation($courseid, $page) {
$tabs = [];
$tabs[] = new tabobject(
'completion',
new moodle_url('/course/completion.php', ['id' => $courseid]),
get_string('coursecompletion', 'completion')
);
if (has_capability('moodle/course:update', context_course::instance($courseid))) {
$tabs[] = new tabobject(
'completion',
new moodle_url('/course/completion.php', ['id' => $courseid]),
get_string('coursecompletion', 'completion')
);
$tabs[] = new tabobject(
'defaultcompletion',
new moodle_url('/course/defaultcompletion.php', ['id' => $courseid]),
get_string('defaultcompletion', 'completion')
);
$tabs[] = new tabobject(
'defaultcompletion',
new moodle_url('/course/defaultcompletion.php', ['id' => $courseid]),
get_string('defaultcompletion', 'completion')
);
}
$tabs[] = new tabobject(
'bulkcompletion',
new moodle_url('/course/bulkcompletion.php', ['id' => $courseid]),
get_string('bulkactivitycompletion', 'completion')
);
if (core_completion\manager::can_edit_bulk_completion($courseid)) {
$tabs[] = new tabobject(
'bulkcompletion',
new moodle_url('/course/bulkcompletion.php', ['id' => $courseid]),
get_string('bulkactivitycompletion', 'completion')
);
}
return $this->tabtree($tabs, $page);
if (count($tabs) > 1) {
return $this->tabtree($tabs, $page);
} else {
return '';
}
}
@ -68,4 +76,8 @@ class core_course_bulk_activity_completion_renderer extends plugin_renderer_base
return parent::render_from_template('core_course/defaultactivitycompletion', $data);
}
public function activities_list($data) {
return parent::render_from_template('core_course/activityinstance', $data);
}
}

9
course/completion.php
View File

@ -53,7 +53,14 @@ if ($id) {
print_error('invalidcourseid');
}
require_login($course);
require_capability('moodle/course:update', context_course::instance($course->id));
$context = context_course::instance($course->id);
if (!has_capability('moodle/course:update', $context)) {
if (core_completion\manager::can_edit_bulk_completion($course)) {
redirect(new moodle_url('/course/bulkcompletion.php', ['id' => $course->id]));
} else {
require_capability('moodle/course:update', $context);
}
}
} else {
require_login();

1
course/defaultcompletion.php
View File

@ -52,6 +52,7 @@ if ($id) {
}
// Set up the page.
navigation_node::override_active_url(new moodle_url('/course/completion.php', array('id' => $course->id)));
$PAGE->set_course($course);
$PAGE->set_url('/course/bulkcompletion.php', array('id' => $course->id));
$PAGE->set_title($course->shortname);

1
course/lib.php
View File

@ -3870,6 +3870,7 @@ function course_get_user_administration_options($course, $context) {
$options = new stdClass;
$options->update = has_capability('moodle/course:update', $context);
$options->editcompletion = core_completion\manager::can_edit_bulk_completion($course);
$options->filters = has_capability('moodle/filter:manage', $context) &&
count(filter_get_available_in_context($context)) > 0;
$options->reports = has_capability('moodle/site:viewreports', $context);

2
course/templates/activityinstance.mustache
View File

@ -47,7 +47,9 @@
<div class="activityinstance col-sm-6 span6">
<div class="mod-indent-outer"></div>
<div>
{{#canmanage}}
<input type="checkbox" class="m-r-1" name="cmid[]" data-section="{{sectionnumber}}" value="{{cmid}}" aria-label="{{#str}}checkactivity, completion, {{modname}}{{/str}}">
{{/canmanage}}
<a href={{url}}>
<img src="{{icon}}" class="iconlarge activityicon" alt=" " role="presentation" />
<span class="instancename">{{modname}}</span>

6
course/tests/externallib_test.php
View File

@ -1942,7 +1942,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$adminoptions->{$option['name']} = $option['available'];
}
if ($course['id'] == SITEID) {
$this->assertCount(15, $course['options']);
$this->assertCount(16, $course['options']);
$this->assertFalse($adminoptions->update);
$this->assertFalse($adminoptions->filters);
$this->assertFalse($adminoptions->reports);
@ -1957,8 +1957,9 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertFalse($adminoptions->publish);
$this->assertFalse($adminoptions->reset);
$this->assertFalse($adminoptions->roles);
$this->assertFalse($adminoptions->editcompletion);
} else {
$this->assertCount(14, $course['options']);
$this->assertCount(15, $course['options']);
$this->assertFalse($adminoptions->update);
$this->assertFalse($adminoptions->filters);
$this->assertFalse($adminoptions->reports);
@ -1973,6 +1974,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertFalse($adminoptions->publish);
$this->assertFalse($adminoptions->reset);
$this->assertFalse($adminoptions->roles);
$this->assertFalse($adminoptions->editcompletion);
}
}
}

6
lib/navigationlib.php
View File

@ -4207,14 +4207,16 @@ class settings_navigation extends navigation_node {
$coursenode->add($editstring, $editurl, self::TYPE_SETTING, null, 'turneditingonoff', new pix_icon('i/edit', ''));
}
if ($adminoptions->update) {
if ($adminoptions->update || $adminoptions->editcompletion) {
// Add the course completion settings link
if ($CFG->enablecompletion && $course->enablecompletion) {
$url = new moodle_url('/course/completion.php', array('id'=>$course->id));
$coursenode->add(get_string('coursecompletion', 'completion'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/settings', ''));
}
} else if ($adminoptions->tags) {
}
if (!$adminoptions->update && $adminoptions->tags) {
$url = new moodle_url('/course/tags.php', array('id' => $course->id));
$coursenode->add(get_string('coursetags', 'tag'), $url, self::TYPE_SETTING, null, 'coursetags', new pix_icon('i/settings', ''));
}