WIP entity support for UserAction

atk4 · Apr 30, 2021 · 33b01d3 · 33b01d3
1 parent 7ea93aa
commit 33b01d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Card.php b/src/Card.php
@@ -280,8 +280,7 @@ public function addAction(Model\UserAction $action, $executor, $button = null)
 
             $page->add($executor = new $executor());
 
-            $action->getModel()->assertIsEntity(); // TODO remove before #1623 merge
-            $action->getModel()->load($id);
+            $action->setEntity($action->getModel()->load($id));
 
             $executor->setAction($action);
         });

diff --git a/src/UserAction/ConfirmationExecutor.php b/src/UserAction/ConfirmationExecutor.php
@@ -129,8 +129,7 @@ public function executeModelAction()
     {
         $id = $this->stickyGet($this->name);
         if ($id && $this->action->appliesTo === Model\UserAction::APPLIES_TO_SINGLE_RECORD) {
-            $this->action->getModel()->assertIsEntity(); // TODO remove before #1623 merge
-            $this->action->getModel()->tryLoad($id);
+            $this->action->setEntity($this->action->getModel()->tryLoad($id));
         }
 
         $this->loader->set(function ($modal) {

diff --git a/src/UserAction/JsCallbackExecutor.php b/src/UserAction/JsCallbackExecutor.php
@@ -64,8 +64,7 @@ public function executeModelAction(array $args = [])
             // may be id is passed as 'id' or model->id_field within $post args.
             $id = $_POST['c0'] ?? $_POST['id'] ?? $_POST[$this->action->getModel()->id_field] ?? null;
             if ($id && $this->action->appliesTo === Model\UserAction::APPLIES_TO_SINGLE_RECORD) {
-                $this->action->getModel()->assertIsEntity(); // TODO remove before #1623 merge
-                $this->action->getModel()->tryLoad($id);
+                $this->action->setEntity($this->action->getModel()->tryLoad($id));
             }
 
             if ($errors = $this->_hasAllArguments()) {

diff --git a/src/UserAction/ModalExecutor.php b/src/UserAction/ModalExecutor.php
@@ -182,8 +182,7 @@ public function executeModelAction()
     {
         $id = $this->stickyGet($this->name);
         if ($id && $this->action->appliesTo === Model\UserAction::APPLIES_TO_SINGLE_RECORD) {
-            $this->action->getModel()->assertIsEntity(); // TODO remove before #1623 merge
-            $this->action->getModel()->tryLoad($id);
+            $this->action->setEntity($this->action->getModel()->tryLoad($id));
         }
 
         if ($this->action->fields === true) {
@@ -193,6 +192,10 @@ public function executeModelAction()
         $this->loader->set(function ($modal) {
             $this->jsSetBtnState($modal, $this->step);
 
+            if (!$this->action->getModel()->isEntity()) {
+                $this->action->setEntity($this->action->getModel()->createEntity());
+            }
+
             try {
                 switch ($this->step) {
                     case 'args':