Merge branch 'release/1.3.3'

trilbymedia · Jan 5, 2023 · 04ec3cc · 04ec3cc
2 parents 66b3191 + eec3c05
commit 04ec3cc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v1.3.3
+## 01/04/2023
+
+1. [](#improved)
+   * Save `post-save` action to session
+   * Set default `post-save` action to `edit` for create and edit 
+
 # v1.3.2
 ## 12/02/2022
 

diff --git a/admin/templates/forms/fields/save-redirect/save-redirect.html.twig b/admin/templates/forms/fields/save-redirect/save-redirect.html.twig
@@ -3,7 +3,7 @@
 {% set originalValue = value %}
 {% set value = (value is null ? field.default : value) %}
 {% set isNew = key ? false : true %}
-{% set savedOption = grav.session.post_entries_save|default('create-new') %}
+{% set savedOption = grav.session.post_entries_save|default('edit') %}
 
 {% if isNew %}
     {% set options = {'create-new':'PLUGIN_FLEX_OBJECTS.ACTION.CREATE_NEW', 'edit':'PLUGIN_FLEX_OBJECTS.ACTION.EDIT_ITEM', 'list':'PLUGIN_FLEX_OBJECTS.ACTION.LIST_ITEMS'} %}
@@ -12,7 +12,6 @@
 {% endif %}
 
 {% block input %}
-    {% set savedOption = not isNew and savedOption == 'create-new' ? 'edit' : savedOption %}
     {% for key, text in options %}
         {% set id = field.id|default(field.name) ~ '-' ~ key %}
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Flex Objects
 slug: flex-objects
 type: plugin
-version: 1.3.2
+version: 1.3.3
 description: Flex Objects plugin allows you to manage Flex Objects in Grav Admin.
 icon: list-alt
 author:

diff --git a/classes/Admin/AdminController.php b/classes/Admin/AdminController.php
@@ -907,6 +907,7 @@ public function taskSave(): void
             // Set route to point to the current page.
             if (!$this->redirect) {
                 $postAction = $request->getParsedBody()['_post_entries_save'] ?? 'edit';
+                $this->grav['session']->post_entries_save = $postAction;
                 if ($postAction === 'create-new') {
                     // Create another.
                     $route = $this->referrerRoute->withGravParam('action', null)->withGravParam('', 'add');