From b77d0e6053fd432eb59a5cd2ed503ab64d1f90b6 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 14 Jun 2018 16:47:06 +0300 Subject: [PATCH 1/4] Fixed broken folder attribute on filepicker [#1465] --- CHANGELOG.md | 6 ++++++ classes/adminbasecontroller.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6f7dbc2..2d4dafb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.8.5 +## mm/dd/2018 + +1. [](#bugfix) + * Fixed broken folder attribute on filepicker [#1465](https://github.com/getgrav/grav-plugin-admin/issues/1465) + # v1.8.4 ## 06/11/2018 diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php index e6e44f27..4ed8817a 100644 --- a/classes/adminbasecontroller.php +++ b/classes/adminbasecontroller.php @@ -751,7 +751,7 @@ class AdminBaseController return false; } - if ($data instanceof Data) { + if (method_exists($data, 'blueprints')) { $settings = $data->blueprints()->schema()->getProperty($this->post['name']); } elseif (method_exists($data, 'getBlueprint')) { $settings = $data->getBlueprint()->schema()->getProperty($this->post['name']); @@ -760,7 +760,7 @@ class AdminBaseController if (isset($settings['folder'])) { $folder = $settings['folder']; } else { - $folder = '@self'; + $folder = 'self@'; } // Do not use self@ outside of pages From 2fc38795059373ae9dcd2135f7ae9558615c6d37 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 14 Jun 2018 19:19:51 +0300 Subject: [PATCH 2/4] Added translation for system.session.initialize --- languages/en.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/languages/en.yaml b/languages/en.yaml index 9904efa0..d6c7eca4 100644 --- a/languages/en.yaml +++ b/languages/en.yaml @@ -714,3 +714,5 @@ PLUGIN_ADMIN: ROUTE_ALIASES: "Route Aliases" OPEN_NEW_TAB: "Open in new tab" PAGEMEDIA_RESIZER: "> The following settings apply to images uploaded through the page media. Resize Width / Height will automatically resize down and proportionally an image if exceeds the limits set in the inputs. Resolution min and max values define the size ranges for uploaded images. Set the fields to 0 to prevent any manipulation." + SESSION_INITIALIZE: "Always Initialize Session" + SESSION_INITIALIZE_HELP: "Makes Grav to always to start a session. This feature is needed to make any user interaction to work, such as login, forms etc. Admin plugin isn't affected by this setting." \ No newline at end of file From fe7ce08a4e40ec1a7de0338cca8c2f9d0984e33e Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 14 Jun 2018 19:32:07 +0300 Subject: [PATCH 3/4] Slight updates on new translation strings --- languages/en.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/en.yaml b/languages/en.yaml index d6c7eca4..0d89de41 100644 --- a/languages/en.yaml +++ b/languages/en.yaml @@ -714,5 +714,5 @@ PLUGIN_ADMIN: ROUTE_ALIASES: "Route Aliases" OPEN_NEW_TAB: "Open in new tab" PAGEMEDIA_RESIZER: "> The following settings apply to images uploaded through the page media. Resize Width / Height will automatically resize down and proportionally an image if exceeds the limits set in the inputs. Resolution min and max values define the size ranges for uploaded images. Set the fields to 0 to prevent any manipulation." - SESSION_INITIALIZE: "Always Initialize Session" - SESSION_INITIALIZE_HELP: "Makes Grav to always to start a session. This feature is needed to make any user interaction to work, such as login, forms etc. Admin plugin isn't affected by this setting." \ No newline at end of file + SESSION_INITIALIZE: "Initialize Session" + SESSION_INITIALIZE_HELP: "Makes Grav to start a session. This feature is needed to make any user interaction to work, such as login, forms etc. Admin plugin isn't affected by this setting." \ No newline at end of file From f389c381999c69341fc9d7d04ac7b5aa6b9f3a35 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 19 Jun 2018 18:50:42 +0100 Subject: [PATCH 4/4] changelog updated --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d4dafb7..f3ed7567 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # v1.8.5 -## mm/dd/2018 +## 06/19/2018 1. [](#bugfix) * Fixed broken folder attribute on filepicker [#1465](https://github.com/getgrav/grav-plugin-admin/issues/1465) + * Added translation for system.session.initialize + * Slight updates on new translation strings # v1.8.4 ## 06/11/2018