wip

Author: z-song

resources/views/actions/form/modal.blade.php

@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="{{ $modal_id }}">
+<div class="modal" tabindex="-1" role="dialog" id="{{ $modal_id }}">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

src/Actions/Action.php

@@ -365,7 +365,7 @@ public function handleActionPromise()
         };
         
         var actionCatcher = function (request) {
-            if (typeof request.responseJSON === 'object') {
+            if (request && typeof request.responseJSON === 'object') {
                 $.admin.toastr.error(request.responseJSON.message, '', {positionClass:"toast-bottom-center", timeOut: 10000}).css("width","500px")
             }
         };

src/Actions/Interactor/Form.php

@@ -280,7 +280,7 @@ public function addElementAttr($content, $selector)
         $crawler = new Crawler($content);
 
         $node = $crawler->filter($selector)->getNode(0);
-        $node->setAttribute('modal', $this->modalId);
+        $node->setAttribute('modal', $this->getModalId());
 
         return $crawler->children()->html();
     }
@@ -368,29 +368,44 @@ protected function resolveView($class)
     }
 
     /**
-     * @param string $modalID
+     * @return void
      */
-    public function addModalHtml($modalID)
+    public function addModalHtml()
     {
         $data = [
             'fields'   => $this->fields,
             'title'    => $this->action->name(),
-            'modal_id' => $modalID,
+            'modal_id' => $this->getModalId(),
         ];
 
         $modal = view('admin::actions.form.modal', $data)->render();
 
         Admin::html($modal);
     }
 
+    /**
+     * @return string
+     */
+    protected function getModalId()
+    {
+        if (!$this->modalId) {
+
+            if ($this->action instanceof RowAction) {
+                $this->modalId = uniqid('row-action-modal-');
+            } else {
+                $this->modalId = strtolower(str_replace('\\', '-', get_class($this->action)));
+            }
+        }
+
+        return $this->modalId;
+    }
+
     /**
      * @return void
      */
     public function addScript()
     {
-        $this->modalId = uniqid('action-modal-');
-
-        $this->action->attribute('modal', $this->modalId);
+        $this->action->attribute('modal', $this->getModalId());
 
         $parameters = json_encode($this->action->parameters());
 
@@ -430,7 +445,7 @@ protected function buildActionPromise()
             call_user_func([$this->action, 'form']);
         }
 
-        $this->addModalHtml($this->modalId);
+        $this->addModalHtml();
 
         return <<<SCRIPT
             var process = new Promise(function (resolve,reject) {