Better fix for session-based parent overriding root page parents #1078

getgrav · Apr 21, 2017 · 9fe0290 · 9fe0290
1 parent b250039
commit 9fe0290
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
     * Added back `Admin::initTheme()` relying on Grav fix [#1069](https://github.com/getgrav/grav-plugin-admin/pull/1069) as it conflicts ith Gantry5
     * Fix for missing scrollbar when in full-size editor for Firefox [#1077](https://github.com/getgrav/grav-plugin-admin/issues/1077)
     * Fix for overlay of Add-Page button in full-size editor [#1077](https://github.com/getgrav/grav-plugin-admin/issues/1077)
+    * Better fix for session-based parent overriding root page parents [#1078](https://github.com/getgrav/grav-plugin-admin/issues/1078)
 
 # v1.4.1
 ## 04/19/2017

diff --git a/themes/grav/templates/forms/fields/parents/parents.html.twig b/themes/grav/templates/forms/fields/parents/parents.html.twig
@@ -1,10 +1,8 @@
 {% extends "forms/fields/pages/pages.html.twig" %}
 
 {% block input %}
-    {% if value is empty %}
-        {% set value = admin.getLastPageRoute %}
-    {% endif %}
-    {% set defaults = {show_root:true, show_all:true, show_slug:true} %}
+    {% set last_page_route = admin.page.getLastPageRoute %}
+    {% set defaults = {show_root:true, show_all:true, show_slug:true, default: last_page_route} %}
     {% set field = field|merge(defaults) %}
     {{ parent() }}
 {% endblock %}