moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-56285-master' of git://github.com/StudiUM/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-10-10 11:14:22 +01:00
commit 49e12de63f
2 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
competency/classes/api.php
View file

@ -2196,10 +2196,13 @@ class api {
*/ */
public static function reorder_template_competency($templateid, $competencyidfrom, $competencyidto) { public static function reorder_template_competency($templateid, $competencyidfrom, $competencyidto) {
static::require_enabled(); static::require_enabled();
// First we do a permissions check. $template = new template($templateid);
$context = context_system::instance();
require_capability('moodle/competency:templatemanage', $context); // First we do a permissions check.
if (!$template->can_manage()) {
throw new required_capability_exception($template->get_context(), 'moodle/competency:templatemanage',
'nopermissions', '');
}
$down = true; $down = true;
$matches = template_competency::get_records(array('templateid' => $templateid, 'competencyid' => $competencyidfrom)); $matches = template_competency::get_records(array('templateid' => $templateid, 'competencyid' => $competencyidfrom));

65
competency/tests/api_test.php
View file

@ -1883,6 +1883,71 @@ class core_competency_api_testcase extends advanced_testcase {
$this->assertInstanceOf('core_competency\\template_cohort', $result); $this->assertInstanceOf('core_competency\\template_cohort', $result);
} }
public function test_reorder_template_competencies_permissions() {
$this->resetAfterTest(true);
$dg = $this->getDataGenerator();
$lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
$cat = $dg->create_category();
$catcontext = context_coursecat::instance($cat->id);
$syscontext = context_system::instance();
$user = $dg->create_user();
$role = $dg->create_role();
assign_capability('moodle/competency:templatemanage', CAP_ALLOW, $role, $syscontext->id, true);
$dg->role_assign($role, $user->id, $syscontext->id);
// Create a template.
$template = $lpg->create_template(array('contextid' => $catcontext->id));
// Create a competency framework.
$framework = $lpg->create_framework(array('contextid' => $catcontext->id));
// Create competencies.
$competency1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
$competency2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get_id()));
// Add the competencies.
$lpg->create_template_competency(array(
'templateid' => $template->get_id(),
'competencyid' => $competency1->get_id()
));
$lpg->create_template_competency(array(
'templateid' => $template->get_id(),
'competencyid' => $competency2->get_id()
));
$this->setUser($user);
// Can reorder competencies with system context permissions in category context.
$result = api::reorder_template_competency($template->get_id(), $competency2->get_id(), $competency1->get_id());
$this->assertTrue($result);
unassign_capability('moodle/competency:templatemanage', $role, $syscontext->id);
accesslib_clear_all_caches_for_unit_testing();
try {
api::reorder_template_competency($template->get_id(), $competency2->get_id(), $competency1->get_id());
$this->fail('Exception expected due to not permissions to manage template competencies');
} catch (required_capability_exception $e) {
$this->assertEquals('nopermissions', $e->errorcode);
}
// Giving permissions in category context.
assign_capability('moodle/competency:templatemanage', CAP_ALLOW, $role, $catcontext->id, true);
$dg->role_assign($role, $user->id, $catcontext->id);
// User with templatemanage capability in category context can reorder competencies in temple.
$result = api::reorder_template_competency($template->get_id(), $competency1->get_id(), $competency2->get_id());
$this->assertTrue($result);
// Removing templatemanage capability in category context.
unassign_capability('moodle/competency:templatemanage', $role, $catcontext->id);
accesslib_clear_all_caches_for_unit_testing();
try {
api::reorder_template_competency($template->get_id(), $competency2->get_id(), $competency1->get_id());
$this->fail('Exception expected due to not permissions to manage template competencies');
} catch (required_capability_exception $e) {
$this->assertEquals('nopermissions', $e->errorcode);
}
}
public function test_delete_template() { public function test_delete_template() {
$this->resetAfterTest(true); $this->resetAfterTest(true);
$this->setAdminUser(); $this->setAdminUser();