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

MDL-23255 fixed inverted isset preventing visibility change in course edit form (creadit goes to Jay Knight) + fixed visibility of new course in hidden category when not allowed to change visibility; improved comments

Browse Source
This commit is contained in:
Petr Skoda
2010-07-14 14:23:32 +00:00
parent 5ad337c86c
commit db1218a970
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/edit_form.php
+6 -2
View File
@@ -200,9 +200,13 @@ class course_edit_form extends moodleform {
$mform->addElement('select', 'visible', get_string('availability'), $choices);
$mform->addHelpButton('visible', 'availability');
$mform->setDefault('visible', $courseconfig->visible);
if (!empty($course->id) and !has_capability('moodle/course:visibility', $coursecontext)) {
if (!has_capability('moodle/course:visibility', $context)) {
$mform->hardFreeze('visible');
$mform->setConstant('visible', $course->visible);
if (!empty($course->id)) {
$mform->setConstant('visible', $course->visible);
} else {
$mform->setConstant('visible', $category->visible);
}
}
//--------------------------------------------------------------------------------
course/lib.php
+6 -7
View File
@@ -3471,12 +3471,11 @@ function create_course($data, $editoroptions = NULL) {
$data->summary_format = FORMAT_HTML;
}
// init visible flags
if (isset($data->visible)) {
$data->visibleold = $data->visible;
} else {
$data->visibleold = $data->visible = 1;
if (!isset($data->visible)) {
// data not from form, add missing visibility info
$data->visible = $category->category;
}
$data->visibleold = $data->visible;
$newcourseid = $DB->insert_record('course', $data);
$context = get_context_instance(CONTEXT_COURSE, $newcourseid, MUST_EXIST);
@@ -3557,8 +3556,8 @@ function update_course($data, $editoroptions = NULL) {
}
$movecat = (isset($data->category) and $oldcourse->category != $data->category);
// init visible flags
if (isset($data->visible)) {
if (!isset($data->visible)) {
// data not from form, add missing visibility info
$data->visible = $oldcourse->visible;
}