Skip to content
Browse files

MDL-37430 Course - Make modules created in hidden sections visible wh…

…en section is made visible.
  • Loading branch information...
1 parent b4d8965 commit 545b77c8f20c0becee0ea396810a2fe278aacee6 @damyon damyon committed
Showing with 35 additions and 1 deletion.
  1. +10 −1 course/lib.php
  2. +1 −0 course/modedit.php
  3. +1 −0 course/rest.php
  4. +3 −0 course/yui/dragdrop/dragdrop.js
  5. +20 −0 course/yui/toolboxes/toolboxes.js
View
11 course/lib.php
@@ -3137,7 +3137,7 @@ function reorder_sections($sections, $origin_position, $target_position) {
* All parameters are objects
*/
function moveto_module($mod, $section, $beforemod=NULL) {
- global $OUTPUT;
+ global $OUTPUT, $DB;
/// Remove original module from original section
if (! delete_mod_from_section($mod->id, $mod->section)) {
@@ -3146,7 +3146,16 @@ function moveto_module($mod, $section, $beforemod=NULL) {
// if moving to a hidden section then hide module
if (!$section->visible && $mod->visible) {
+ // Set this in the object because it is sent as a response to ajax calls.
+ $mod->visible = 0;
set_coursemodule_visible($mod->id, 0);
+ // Set visibleold to 1 so module will be visible when section is made visible.
+ $DB->set_field('course_modules', 'visibleold', 1, array('id' => $mod->id));
+ }
+ if ($section->visible && !$mod->visible) {
+ set_coursemodule_visible($mod->id, $mod->visibleold);
+ // Set this in the object because it is sent as a response to ajax calls.
+ $mod->visible = $mod->visibleold;
}
/// Add the module into the new section
View
1 course/modedit.php
@@ -480,6 +480,7 @@
// make sure visibility is set correctly (in particular in calendar)
// note: allow them to set it even without moodle/course:activityvisibility
set_coursemodule_visible($fromform->coursemodule, $fromform->visible);
+ $DB->set_field('course_modules', 'visibleold', 1, array('id' => $fromform->coursemodule));
if (isset($fromform->cmidnumber)) { //label
// set cm idnumber - uniqueness is already verified by form validation
View
1 course/rest.php
@@ -134,6 +134,7 @@
}
moveto_module($cm, $section, $beforemod);
+ echo json_encode(array('visible' => $cm->visible));
break;
case 'gettitle':
require_capability('moodle/course:manageactivities', $modcontext);
View
3 course/yui/dragdrop/dragdrop.js
@@ -385,6 +385,9 @@ YUI.add('moodle-course-dragdrop', function(Y) {
spinner.show();
},
success: function(tid, response) {
+ var responsetext = Y.JSON.parse(response.responseText);
+ var params = {element: dragnode, visible: responsetext.visible};
+ M.course.coursebase.invoke_function('set_visibility_resource_ui', params);
this.unlock_drag_handle(drag, CSS.EDITINGMOVE);
window.setTimeout(function(e) {
spinner.hide();
View
20 course/yui/toolboxes/toolboxes.js
@@ -601,6 +601,26 @@ YUI.add('moodle-course-toolboxes', function(Y) {
}
}, this);
listenevents.push(thisevent);
+ },
+ /**
+ * Set the visibility of the current resource (identified by the element)
+ * to match the hidden parameter (this is not a toggle).
+ * Only changes the visibility in the browser (no ajax update).
+ * @param args An object with 'element' being the A node containing the resource
+ * and 'visible' being the state that the visiblity should be set to.
+ * @return void
+ */
+ set_visibility_resource_ui: function(args) {
+ var element = args.element;
+ var shouldbevisible = args.visible;
+ var buttonnode = element.one(CSS.SHOW);
+ var visible = (buttonnode === null);
+ if (visible) {
+ buttonnode = element.one(CSS.HIDE);
+ }
+ if (visible != shouldbevisible) {
+ this.toggle_hide_resource_ui(buttonnode);
+ }
}
}, {
NAME : 'course-resource-toolbox',

0 comments on commit 545b77c

Please sign in to comment.
Something went wrong with that request. Please try again.