Merge pull request #3104 from Laravel-Backpack/fix-save-action-order-picking

[4.1] Fixing save action order picking

Author: tabacitu

src/app/Library/CrudPanel/Traits/SaveActions.php

@@ -24,18 +24,19 @@ public function getSaveActionDefaultForCurrentOperation()
      */
     public function getFallBackSaveAction()
     {
-        //we get the higher order in save actions array. It will return something only when explicit by developer
+        //we get the higher order in save actions array. By default it would be `save_and_back`
         $higherAction = $this->getSaveActionByOrder(1);
 
-        if (empty($higherAction)) {
-            if ($this->hasOperationSetting('defaultSaveAction')) {
-                return $this->getOperationSetting('defaultSaveAction');
-            }
+        //if there is an higher action and that action is not the backpack default higher one `save_and_back` we return it.
+        if (! empty($higherAction) && key($higherAction) !== 'save_and_back') {
+            return key($higherAction);
+        }
 
-            return $this->getSaveActionDefaultForCurrentOperation();
+        if ($this->hasOperationSetting('defaultSaveAction')) {
+            return $this->getOperationSetting('defaultSaveAction');
         }
 
-        return key($higherAction);
+        return $this->getSaveActionDefaultForCurrentOperation();
     }
 
     /**