Merge pull request #240 from FriendsOfCake/action-links-config

Action links config
FriendsOfCake · Apr 6, 2018 · 6407198 · 6407198
2 parents 771f3a4 + 364a991
commit 6407198
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Listener/ViewListener.php b/src/Listener/ViewListener.php
@@ -421,14 +421,13 @@ protected function _getControllerActionConfiguration($actionName, $config)
             $action = $this->_action($realAction);
             $class = get_class($action);
             $class = substr($class, strrpos($class, '\\') + 1);
-            $config['scope'] = $action->scope();
 
             if ($class === 'DeleteAction') {
-                $config['method'] = 'DELETE';
+                $config += ['method' => 'DELETE'];
             }
 
-            if ($class === 'AddAction') {
-                $config['scope'] = 'table';
+            if (!isset($config['scope'])) {
+                $config['scope'] = $class === 'AddAction' ? 'table' : $action->scope();
             }
         }
 
@@ -448,7 +447,7 @@ protected function _getControllerActionConfiguration($actionName, $config)
             'method' => $method,
             'options' => array_diff_key(
                 $config,
-                array_flip(['method', 'scope', 'className', 'link_title', 'messages', 'url', 'scaffold'])
+                array_flip(['method', 'scope', 'link_title', 'url', 'scaffold', 'callback'])
             )
         ];
         if (!empty($config['callback'])) {
@@ -467,7 +466,7 @@ protected function _getAllowedActions()
     {
         $actions = $this->_action()->getConfig('scaffold.actions');
         if ($actions === null) {
-            $actions = $this->_crud()->getConfig('actions');
+            $actions = array_keys($this->_crud()->getConfig('actions'));
         }
 
         $extraActions = $this->_action()->getConfig('scaffold.extra_actions') ?: [];