MDL-28195 confirm_action should allow the button labels to be customised

moodle · Jul 11, 2011 · c159d8e · c159d8e
1 parent a8361fc
commit c159d8e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
@@ -275,8 +275,17 @@ M.util.show_confirm_dialog = function(e, args) {
             }
         };
 
-        var buttons = [ {text: M.str.moodle.cancel, handler: handle_cancel, isDefault: true},
+        if (!args.cancellabel) {
-                        {text: M.str.moodle.yes, handler: handle_yes} ];
+            args.cancellabel = M.str.moodle.cancel;
+        }
+        if (!args.continuelabel) {
+            args.continuelabel = M.str.moodle.yes;
+        }
+
+        var buttons = [
+            {text: args.cancellabel,   handler: handle_cancel, isDefault: true},
+            {text: args.continuelabel, handler: handle_yes}
+        ];
 
         simpledialog.cfg.queueProperty('buttons', buttons);
 

diff --git a/lib/outputactions.php b/lib/outputactions.php
@@ -85,8 +85,10 @@ public function __construct($event, $jsfunction, $jsfunctionargs=array()) {
  * Confirm action
  */
 class confirm_action extends component_action {
-    public function __construct($message, $callback=null) {
+    public function __construct($message, $callback = null, $continuelabel = null, $cancellabel = null) {
-        parent::__construct('click', 'M.util.show_confirm_dialog', array('message' => $message, 'callback' => $callback));
+        parent::__construct('click', 'M.util.show_confirm_dialog', array(
+                'message' => $message, 'callback' => $callback,
+                'continuelabel' => $continuelabel, 'cancellabel' => $cancellabel));
     }
 }
 

diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
@@ -481,7 +481,7 @@ public function __construct(moodle_url $url, $label, $method='post') {
      * @return void
      */
     public function add_confirm_action($confirmmessage) {
-        $this->add_action(new component_action('click', 'M.util.show_confirm_dialog', array('message' => $confirmmessage)));
+        $this->add_action(new confirm_action($confirmmessage));
     }
 
     /**