Merge branch 'MDL-74144-311' of https://github.com/paulholden/moodle …

…into MOODLE_311_STABLE
moodle · Mar 16, 2022 · 22fb553 · 22fb553
2 parents 820cac7 + 767d46b
commit 22fb553
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/user/amd/build/private_files.min.js b/user/amd/build/private_files.min.js
diff --git a/user/amd/build/private_files.min.js.map b/user/amd/build/private_files.min.js.map
diff --git a/user/amd/src/private_files.js b/user/amd/src/private_files.js
@@ -33,13 +33,17 @@ import {add as addToast} from 'core/toast';
  */
 export const initDynamicForm = (containerSelector, formClass) => {
     const form = new DynamicForm(document.querySelector(containerSelector), formClass);
+
     // When form is saved, refresh it to remove validation errors, if any:
     form.addEventListener(form.events.FORM_SUBMITTED, () => {
         form.load();
         getString('changessaved')
         .then(addToast)
         .catch(null);
     });
+
+    // Reload the page on cancel.
+    form.addEventListener(form.events.CANCEL_BUTTON_PRESSED, () => window.location.reload());
 };
 
 /**

diff --git a/user/classes/form/private_files.php b/user/classes/form/private_files.php
@@ -60,8 +60,10 @@ public function definition() {
         }
         $mform->setType('returnurl', PARAM_LOCALURL);
 
+        // The 'nosubmit' param (default false) determines whether we should show the standard form action buttons (save/cancel).
+        // This value is set when the form is displayed within a modal, which adds the action buttons itself.
         if (!$this->optional_param('nosubmit', false, PARAM_BOOL)) {
-            $this->add_action_buttons(false, get_string('savechanges'));
+            $this->add_action_buttons();
         }
     }