Skip to content

Commit

Permalink
Merge branch 'w27_MDL-28273_m22_cohortremove' of git://github.com/sko…
Browse files Browse the repository at this point in the history
…dak/moodle
  • Loading branch information
Sam Hemelryk committed Jul 11, 2011
2 parents 3bbc7a0 + 5121a95 commit 48ae99c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cohort/assign.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('assignto', 'cohort', format_string($cohort->name)));

echo $OUTPUT->notification(get_string('removeuserwarning', 'core_cohort'));

// Get the user_selector we will need.
$potentialuserselector = new cohort_candidate_selector('addselect', array('cohortid'=>$cohort->id));
$existinguserselector = new cohort_existing_selector('removeselect', array('cohortid'=>$cohort->id));
Expand Down
1 change: 1 addition & 0 deletions lang/en/cohort.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@
$string['nocomponent'] = 'Created manually';
$string['potusers'] = 'Potential users';
$string['potusersmatching'] = 'Potential matching users';
$string['removeuserwarning'] = 'Removing users from a cohort may result in unenrolling of users from multiple courses which includes deleting of user settings, grades, group membership and other user information from affected courses.';
$string['selectfromcohort'] = 'Select members from cohort';

0 comments on commit 48ae99c

Please sign in to comment.