Operation: Fixed setConfirm client side [Closed #137]

o5 · May 28, 2014 · ead9a40 · ead9a40
1 parent c7eec65
commit ead9a40
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Grido/Components/Operation.php b/Grido/Components/Operation.php
@@ -67,7 +67,7 @@ public function setConfirm($operation, $message)
     {
         $message = $this->translate($message);
         $this->grid->onRender[] = function(Grid $grid) use ($operation, $message) {
-            $grid['form'][Operation::ID][Operation::ID]->controlPrototype->data["grido-$operation"] = $message;
+            $grid['form'][Operation::ID][Operation::ID]->controlPrototype->data["grido-confirm-$operation"] = $message;
         };
 
         return $this;

diff --git a/client-side/grido.js b/client-side/grido.js
@@ -341,7 +341,7 @@
 
         onSubmit: function()
         {
-            var hasConfirm = this.getSelect().data('grido-' + this.getSelect().val());
+            var hasConfirm = this.getSelect().attr('data-grido-confirm-' + this.getSelect().val());
             if (hasConfirm) {
                 if (confirm(hasConfirm.replace(/%i/g, $(this.selector + ':checked', this.grido.$table).length))) {
                     return true;

diff --git a/tests/Grido/Components/Operation.phpt b/tests/Grido/Components/Operation.phpt
@@ -23,13 +23,13 @@ class OperationTest extends \Tester\TestCase
         Helper::grid(function(Grid $grid) {
             $grid->setModel(array());
             $grid->addColumnText('column', 'Column');
-            $grid->setOperation(array('edit' => 'Edit', 'del' => 'Del'), function() {})
-                ->setConfirm('del', 'Are you sure?');
+            $grid->setOperation(array('edit' => 'Edit', 'delete' => 'Delete'), function() {})
+                ->setConfirm('delete', 'Are you sure?');
             $grid->render();
         })->run();
 
         $formControl = Helper::$grid['form'][Operation::ID][Operation::ID];
-        Assert::same($formControl->controlPrototype->data['grido-del'], 'Are you sure?');
+        Assert::same($formControl->controlPrototype->data['grido-confirm-delete'], 'Are you sure?');
     }
 
     /**********************************************************************************************/