Fix Model::set() with no longer supported array input (#1367)

atk4 · Jul 15, 2020 · c07e8c4 · c07e8c4
1 parent cf879b0
commit c07e8c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Modal.php b/src/Modal.php
@@ -237,9 +237,9 @@ public function settings($setting_option, $value)
      */
     public function addDenyAction($label, $jsAction)
     {
-        $b = new Button();
-        $b->set($label)->addClass('red cancel');
-        $this->addButtonAction($b);
+        $button = new Button();
+        $button->set($label)->addClass('red cancel');
+        $this->addButtonAction($button);
         $this->options['modal_option']['onDeny'] = $jsAction;
 
         return $this;

diff --git a/src/Table/Column/FilterPopup.php b/src/Table/Column/FilterPopup.php
@@ -65,7 +65,7 @@ public function init(): void
 
         //load data associated with this popup.
         if ($data = $model->recallData()) {
-            $model->set($data);
+            $model->setMulti($data);
         }
         $this->form->setModel($model);
 

diff --git a/src/UserAction/ModalExecutor.php b/src/UserAction/ModalExecutor.php
@@ -338,7 +338,7 @@ protected function doPreview(View $modal)
         $this->_addStepTitle($modal, $this->step);
 
         if ($fields = $this->actionData['fields'] ?? null) {
-            $this->action->getModel()->set($fields);
+            $this->action->getModel()->setMulti($fields);
         }
 
         if ($prev = $this->getPreviousStep($this->step)) {