From b3633096468d813f14a48baf4b5cae4258989ae3 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 24 Apr 2020 12:34:46 +0300 Subject: [PATCH 1/2] Fixed language redirect adding extra language prefix in Flex --- CHANGELOG.md | 1 + classes/plugin/Admin.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77507cdd..62b9fe6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ 1. [](#bugfix) * Prevent loading Pages in Parents field if they don't have children * Fixed custom folder in `mediapicker` field not working with streams + * Fixed language redirect adding extra language prefix in Flex # v1.10.0-rc.8 ## 03/19/2020 diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php index 0cc435a2..21fc1401 100644 --- a/classes/plugin/Admin.php +++ b/classes/plugin/Admin.php @@ -183,6 +183,9 @@ class Admin } else { $this->language = ''; } + + // Set admin route language. + RouteFactory::setLanguage($this->language); } /** From 04b7a6bde84b86ab23f186293583026c06e9dc4f Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 24 Apr 2020 14:39:21 +0300 Subject: [PATCH 2/2] Fixed `Invalid input in "Parent"` when saving page in raw mode [#1869] --- CHANGELOG.md | 1 + blueprints/admin/pages/raw.yaml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62b9fe6c..7c45ca2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Prevent loading Pages in Parents field if they don't have children * Fixed custom folder in `mediapicker` field not working with streams * Fixed language redirect adding extra language prefix in Flex + * Fixed `Invalid input in "Parent"` when saving page in raw mode [#1869](https://github.com/getgrav/grav-plugin-admin/issues/1869) # v1.10.0-rc.8 ## 03/19/2020 diff --git a/blueprints/admin/pages/raw.yaml b/blueprints/admin/pages/raw.yaml index 01e6577c..924a8b51 100644 --- a/blueprints/admin/pages/raw.yaml +++ b/blueprints/admin/pages/raw.yaml @@ -81,8 +81,6 @@ form: type: parents label: PLUGIN_ADMIN.PARENT classes: fancy - validate: - required: true name: type: select