From 2a4ebb10756ed6a7c821497976273473242a062f Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 12 Apr 2019 19:46:35 -0600 Subject: [PATCH 1/4] no longer needed --- classes/admincontroller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 5ba30753..cfea9b55 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -963,7 +963,7 @@ class AdminController extends AdminBaseController } foreach ($update as $slug => $item) { - $resources_updates[$key][$slug] = $item->toArray(); + $resources_updates[$key][$slug] = $item; } } From 33c84222d74409616a7f60587087284369d6fddb Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 13 Apr 2019 17:42:43 -0600 Subject: [PATCH 2/4] Fix for Page saving issues [#1648 --- CHANGELOG.md | 6 ++++++ classes/admincontroller.php | 3 +++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e47b8d89..511a1ace 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.9.1 +## mm/dd/2019 + +1. [](#bugfix) + * Fix for Page saving issues [#1648](https://github.com/getgrav/grav-plugin-admin/issues/1648) + # v1.9.0 ## 04/11/2019 diff --git a/classes/admincontroller.php b/classes/admincontroller.php index cfea9b55..7705030a 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -572,6 +572,9 @@ class AdminController extends AdminBaseController { $reorder = true; + $data = (array)$this->data; + $this->grav['twig']->twig_vars['current_form_data'] = $data; + /** @var Pages $pages */ $pages = $this->grav['pages']; From 929aa195dc8603b0562cccd184e50fdc64d8b4ce Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 13 Apr 2019 17:51:46 -0600 Subject: [PATCH 3/4] Remove status message when picking folder for move #1650 --- CHANGELOG.md | 1 + classes/admincontroller.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 511a1ace..86ef7e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 1. [](#bugfix) * Fix for Page saving issues [#1648](https://github.com/getgrav/grav-plugin-admin/issues/1648) + * Remove status message when picking folder for move [#1650](https://github.com/getgrav/grav-plugin-admin/issues/1650) # v1.9.0 ## 04/11/2019 diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 7705030a..9bdfde85 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -1417,7 +1417,7 @@ class AdminController extends AdminBaseController $this->admin->json_response = [ 'status' => 'success', 'child_type' => '', - 'message' => $this->admin::translate('PLUGIN_ADMIN.NO_CHILD_TYPE') +// 'message' => $this->admin::translate('PLUGIN_ADMIN.NO_CHILD_TYPE') ]; return true; From f48b3f03c448b1a2af5b83938262578df1cdfcbf Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 13 Apr 2019 17:58:55 -0600 Subject: [PATCH 4/4] prepare for release --- CHANGELOG.md | 2 +- blueprints.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86ef7e90..51ab0523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.9.1 -## mm/dd/2019 +## 04/13/2019 1. [](#bugfix) * Fix for Page saving issues [#1648](https://github.com/getgrav/grav-plugin-admin/issues/1648) diff --git a/blueprints.yaml b/blueprints.yaml index 22b5faac..843746c9 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Admin Panel -version: 1.9.0 +version: 1.9.1 testing: false description: Adds an advanced administration panel to manage your site icon: empire @@ -14,7 +14,7 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md license: MIT dependencies: - - { name: grav, version: '>=1.6.0' } + - { name: grav, version: '>=1.6.3' } - { name: form, version: '>=3.0.0' } - { name: login, version: '>=3.0.0' } - { name: email, version: '>=3.0.0' }