diff --git a/mod/folder/backup/moodle2/backup_folder_stepslib.php b/mod/folder/backup/moodle2/backup_folder_stepslib.php index 6b5714308bf0b..e9f593cd937ad 100644 --- a/mod/folder/backup/moodle2/backup_folder_stepslib.php +++ b/mod/folder/backup/moodle2/backup_folder_stepslib.php @@ -39,7 +39,7 @@ protected function define_structure() { // Define each element separated $folder = new backup_nested_element('folder', array('id'), array( 'name', 'intro', 'introformat', 'revision', - 'timemodified', 'display', 'show_expanded')); + 'timemodified', 'display', 'showexpanded')); // Build the tree // (nice mono-tree, lol) diff --git a/mod/folder/backup/moodle2/restore_folder_stepslib.php b/mod/folder/backup/moodle2/restore_folder_stepslib.php index 2618be2d1b309..052f81be81e65 100644 --- a/mod/folder/backup/moodle2/restore_folder_stepslib.php +++ b/mod/folder/backup/moodle2/restore_folder_stepslib.php @@ -48,9 +48,9 @@ protected function process_folder($data) { $data->course = $this->get_courseid(); $data->timemodified = $this->apply_date_offset($data->timemodified); - // If show_expanded is not set, apply site default. - if (!isset($data->show_expanded)) { - $data->show_expanded = get_config('folder', 'show_expanded'); + // If showexpanded is not set, apply site default. + if (!isset($data->showexpanded)) { + $data->showexpanded = get_config('folder', 'showexpanded'); } // insert the folder record diff --git a/mod/folder/db/install.xml b/mod/folder/db/install.xml index aacb69233be62..1c630718b09f7 100644 --- a/mod/folder/db/install.xml +++ b/mod/folder/db/install.xml @@ -1,5 +1,5 @@ - @@ -14,7 +14,7 @@ - + diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php index fabe0c98b2dc7..ebb441dead731 100644 --- a/mod/folder/db/upgrade.php +++ b/mod/folder/db/upgrade.php @@ -91,5 +91,24 @@ function xmldb_folder_upgrade($oldversion) { upgrade_mod_savepoint(true, 2013031500, 'folder'); } + // Rename show_expanded to showexpanded (see MDL-38646). + if ($oldversion < 2013040700) { + + // Rename site config setting. + $showexpanded = get_config('folder', 'show_expanded'); + set_config('showexpanded', $showexpanded, 'folder'); + set_config('show_expanded', null, 'folder'); + + // Rename table column. + $table = new xmldb_table('folder'); + $field = new xmldb_field('show_expanded', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '1', 'revision'); + if ($dbman->field_exists($table, $field)) { + $dbman->rename_field($table, $field, 'showexpanded'); + } + + // folder savepoint reached + upgrade_mod_savepoint(true, 2013040700, 'folder'); + } + return true; } diff --git a/mod/folder/lang/en/folder.php b/mod/folder/lang/en/folder.php index e5d68ce57c530..5f114197662e2 100644 --- a/mod/folder/lang/en/folder.php +++ b/mod/folder/lang/en/folder.php @@ -51,5 +51,5 @@ $string['displaypage'] = 'On a separate page'; $string['displayinline'] = 'Inline on a course page'; $string['noautocompletioninline'] = 'Automatic completion on viewing of activity can not be selected together with "Display inline" option'; -$string['show_expanded'] = 'Show sub-folders expanded'; -$string['show_expanded_help'] = 'If enabled, will display sub-folders expanded by default. Else, sub-folders will display collapsed.'; +$string['showexpanded'] = 'Show sub-folders expanded'; +$string['showexpanded_help'] = 'If enabled, will display sub-folders expanded by default. Else, sub-folders will display collapsed.'; diff --git a/mod/folder/lib.php b/mod/folder/lib.php index 58a747aa293f2..6a7f30873765a 100644 --- a/mod/folder/lib.php +++ b/mod/folder/lib.php @@ -426,7 +426,7 @@ function folder_dndupload_handle($uploadinfo) { function folder_get_coursemodule_info($cm) { global $DB; if (!($folder = $DB->get_record('folder', array('id' => $cm->instance), - 'id, name, display, show_expanded, intro, introformat'))) { + 'id, name, display, showexpanded, intro, introformat'))) { return NULL; } $cminfo = new cached_cm_info(); @@ -434,7 +434,7 @@ function folder_get_coursemodule_info($cm) { if ($folder->display == FOLDER_DISPLAY_INLINE) { // prepare folder object to store in customdata $fdata = new stdClass(); - $fdata->show_expanded = $folder->show_expanded; + $fdata->showexpanded = $folder->showexpanded; if ($cm->showdescription && strlen(trim($folder->intro))) { $fdata->intro = $folder->intro; if ($folder->introformat != FORMAT_MOODLE) { diff --git a/mod/folder/mod_form.php b/mod/folder/mod_form.php index 99f1debfb6a67..1dc61b7363e75 100644 --- a/mod/folder/mod_form.php +++ b/mod/folder/mod_form.php @@ -56,9 +56,9 @@ function definition() { $mform->setExpanded('content'); // Adding option to show sub-folders expanded or collapsed by default. - $mform->addElement('advcheckbox', 'show_expanded', get_string('show_expanded', 'folder')); - $mform->addHelpButton('show_expanded', 'show_expanded', 'mod_folder'); - $mform->setDefault('show_expanded', $config->show_expanded); + $mform->addElement('advcheckbox', 'showexpanded', get_string('showexpanded', 'folder')); + $mform->addHelpButton('showexpanded', 'showexpanded', 'mod_folder'); + $mform->setDefault('showexpanded', $config->showexpanded); //------------------------------------------------------- $this->standard_coursemodule_elements(); diff --git a/mod/folder/renderer.php b/mod/folder/renderer.php index 55420f39f0bf1..a755acf74312b 100644 --- a/mod/folder/renderer.php +++ b/mod/folder/renderer.php @@ -79,11 +79,11 @@ public function render_folder_tree(folder_tree $tree) { $content .= '
'; $content .= $this->htmllize_tree($tree, array('files' => array(), 'subdirs' => array($tree->dir))); $content .= '
'; - $show_expanded = true; - if (empty($tree->folder->show_expanded)) { - $show_expanded = false; + $showexpanded = true; + if (empty($tree->folder->showexpanded)) { + $showexpanded = false; } - $this->page->requires->js_init_call('M.mod_folder.init_tree', array($id, $show_expanded)); + $this->page->requires->js_init_call('M.mod_folder.init_tree', array($id, $showexpanded)); return $content; } diff --git a/mod/folder/settings.php b/mod/folder/settings.php index 4cfea08c7c6ec..6ed8b4a0d3634 100644 --- a/mod/folder/settings.php +++ b/mod/folder/settings.php @@ -31,7 +31,7 @@ $settings->add(new admin_setting_configcheckbox('folder/requiremodintro', get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1)); - $settings->add(new admin_setting_configcheckbox('folder/show_expanded', - get_string('show_expanded', 'folder'), - get_string('show_expanded_help', 'folder'), 1)); + $settings->add(new admin_setting_configcheckbox('folder/showexpanded', + get_string('showexpanded', 'folder'), + get_string('showexpanded_help', 'folder'), 1)); } diff --git a/mod/folder/version.php b/mod/folder/version.php index c3cf83bbc6cb7..9d46a113be5f1 100644 --- a/mod/folder/version.php +++ b/mod/folder/version.php @@ -25,7 +25,7 @@ defined('MOODLE_INTERNAL') || die(); -$module->version = 2013031500; // The current module version (Date: YYYYMMDDXX) +$module->version = 2013040700; // The current module version (Date: YYYYMMDDXX) $module->requires = 2012112900; // Requires this Moodle version $module->component = 'mod_folder'; // Full name of the plugin (used for diagnostics) $module->cron = 0;