From adc7ba3808d31b8b9bcfd3aac0d7cd7d18864052 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sun, 14 Apr 2019 16:10:27 -0600 Subject: [PATCH 1/4] Fix for admin preview of homepage #2426 --- themes/grav/templates/preview.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/grav/templates/preview.html.twig b/themes/grav/templates/preview.html.twig index 115ecaef..bfb95e43 100644 --- a/themes/grav/templates/preview.html.twig +++ b/themes/grav/templates/preview.html.twig @@ -1,6 +1,6 @@ {% extends 'partials/base.html.twig' %} -{% set route = admin.route == '' ? '' : '/' ~ admin.route %} +{% set route = admin.route == '' ? '/' : '/' ~ admin.route %} {% set preview_link = base_url_relative_frontend|rtrim('/') ~ route %} {% set preview_html = (base_url|rtrim('/') ~ '/preview' ~ (context.home ? '' : context.route)) ?: '/' %} {% set admin_route = '/' ~ admin.route %} From 2358919d10cdf045d6cf476c1d1913fdea32f276 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sun, 14 Apr 2019 16:11:29 -0600 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51ab0523..0c9ce597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.9.2 +## mm/dd/2019 + +1. [](#bugfix) + * Fix for homepage admin preview [#2426](https://github.com/getgrav/grav/issues/2426) + # v1.9.1 ## 04/13/2019 From 4fa59f18e8c02278ddfaa1f16d5ce56706c257e8 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 15 Apr 2019 11:27:39 +0300 Subject: [PATCH 3/4] Uploaded Avatar removed from user's yaml when editing the user [#1647] --- CHANGELOG.md | 1 + classes/adminbasecontroller.php | 2 ++ classes/admincontroller.php | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c9ce597..5a2405c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 1. [](#bugfix) * Fix for homepage admin preview [#2426](https://github.com/getgrav/grav/issues/2426) + * Uploaded Avatar removed from user's yaml when editing the user [#1647](https://github.com/getgrav/grav-plugin-admin/issues/1647) # v1.9.1 ## 04/13/2019 diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php index bd11c7a2..647c9e45 100644 --- a/classes/adminbasecontroller.php +++ b/classes/adminbasecontroller.php @@ -764,6 +764,8 @@ class AdminBaseController } else { $obj->modifyHeader($init_key, $new_data); } + } elseif ($obj instanceof UserInterface and $key === 'avatar') { + $obj->set($key, $files); } else { // TODO: [this is JS handled] if it's single file, remove existing and use set, if it's multiple, use join $obj->join($key, $files); // stores diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 9bdfde85..118c8443 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -708,7 +708,6 @@ class AdminController extends AdminBaseController } $user->update($data->toArray()); - $user->undef('avatar'); $user = $this->storeFiles($user); From cd60713129df61335d5314dce2d972664c1c2744 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 15 Apr 2019 14:46:06 -0600 Subject: [PATCH 4/4] prepare for release --- CHANGELOG.md | 2 +- blueprints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a2405c7..fa9578d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.9.2 -## mm/dd/2019 +## 04/15/2019 1. [](#bugfix) * Fix for homepage admin preview [#2426](https://github.com/getgrav/grav/issues/2426) diff --git a/blueprints.yaml b/blueprints.yaml index 843746c9..49c70f5c 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Admin Panel -version: 1.9.1 +version: 1.9.2 testing: false description: Adds an advanced administration panel to manage your site icon: empire