L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w29_MDL-28432_m22_cohortconfig' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2011-07-25 09:52:33 +08:00
parent 08ad288d6f 6df9761774
commit 8306a3799e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/cohort/addinstance.php
+1
View File
@@ -35,6 +35,7 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST);
require_login($course);
require_capability('moodle/course:enrolconfig', $context);
require_capability('enrol/cohort:config', $context);
$PAGE->set_url('/enrol/cohort/addinstance.php', array('id'=>$course->id));
$PAGE->set_pagelayout('admin');
enrol/cohort/ajax.php
+8 -1
View File
@@ -74,6 +74,7 @@ switch ($action) {
break;
case 'enrolcohort':
require_capability('moodle/course:enrolconfig', $context);
require_capability('enrol/cohort:config', $context);
$roleid = required_param('roleid', PARAM_INT);
$cohortid = required_param('cohortid', PARAM_INT);
@@ -87,10 +88,16 @@ switch ($action) {
enrol_cohort_sync($manager->get_course()->id);
break;
case 'enrolcohortusers':
require_capability('moodle/course:enrolconfig', $context);
require_capability('enrol/manual:enrol', $context);
$roleid = required_param('roleid', PARAM_INT);
$cohortid = required_param('cohortid', PARAM_INT);
$result = enrol_cohort_enrol_all_users($manager, $cohortid, $roleid);
$roles = $manager->get_assignable_roles();
$cohorts = enrol_cohort_get_cohorts($manager);
if (!array_key_exists($cohortid, $cohorts) || !array_key_exists($roleid, $roles)) {
throw new enrol_ajax_exception('errorenrolcohort');
}
if ($result === false) {
throw new enrol_ajax_exception('errorenrolcohortusers');
}
enrol/cohort/lib.php
+1 -1
View File
@@ -163,7 +163,7 @@ class enrol_cohort_plugin extends enrol_plugin {
$button->strings_for_js('users', 'moodle');
// No point showing this at all if the user cant manually enrol users
$hasmanualinstance = has_capability('enrol/manual:manage', $manager->get_context()) && $manager->has_instance('manual');
$hasmanualinstance = has_capability('enrol/manual:enrol', $manager->get_context()) && $manager->has_instance('manual');
$modules = array('moodle-enrol_cohort-quickenrolment', 'moodle-enrol_cohort-quickenrolment-skin');
$function = 'M.enrol_cohort.quickenrolment.init';