From f82ba2ed504b0e071d02df9d611a0fc10a89eb86 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 17 Dec 2019 10:44:32 +0800 Subject: [PATCH 1/2] MDL-70151 assign: Fix bulk change for behat Behat does not play well with confirmation dialogues and in some situations it does not wait for the page to reload before starting the next step. This change adds a pending_js call which is only resolved if the cancel button was pressed, otherwise it remains in-progress until the page reloads resetting the entire state of it. --- mod/assign/module.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod/assign/module.js b/mod/assign/module.js index f0ee769b8b2..74f50b5be1e 100644 --- a/mod/assign/module.js +++ b/mod/assign/module.js @@ -76,6 +76,7 @@ M.mod_assign.init_grading_table = function(Y) { var batchform = Y.one('form.gradingbatchoperationsform'); if (batchform) { batchform.on('submit', function(e) { + M.util.js_pending('mod_assign/module.js:batch:submit'); checkboxes = Y.all('td.c0 input'); var selectedusers = []; checkboxes.each(function(node) { @@ -102,8 +103,10 @@ M.mod_assign.init_grading_table = function(Y) { confirmmessage = M.util.get_string('batchoperationconfirm' + operation.get('value'), 'assign'); } if (!confirm(confirmmessage)) { + M.util.js_complete('mod_assign/module.js:batch:submit'); e.preventDefault(); } + // Note: Do not js_complete. The page being reloaded will empty it. } }); } From 8c732857bcee1f070632b285b78724182cc1111a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20D=C3=A9niz?= Date: Thu, 10 Dec 2020 21:10:14 +0000 Subject: [PATCH 2/2] weekly release 3.5.15+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index e0aef361933..9789b3fed4c 100644 --- a/version.php +++ b/version.php @@ -29,11 +29,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2018051715.03; // 20180517 = branching date YYYYMMDD - do not modify! +$version = 2018051715.04; // 20180517 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -$release = '3.5.15+ (Build: 20201204)'; // Human-friendly version name +$release = '3.5.15+ (Build: 20201211)'; // Human-friendly version name $branch = '35'; // This version's branch. $maturity = MATURITY_STABLE; // This version's maturity level.