From 7422d39b907abfaa21e3cb8d212003abb75e5e2e Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 21 Apr 2017 22:17:35 -0600
Subject: [PATCH] Allow `show_modular: true|false` to work again in
 parents/pages field #1080

---
 CHANGELOG.md                                                 | 1 +
 themes/grav/templates/forms/fields/pages/pages.html.twig     | 3 ++-
 themes/grav/templates/forms/fields/parents/parents.html.twig | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49a04d81..272a4a9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
     * 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)
+    * Allow support for `Pages::getList()` with `show_modular` option [#1080](https://github.com/getgrav/grav-plugin-admin/issues/1080)
 
 # v1.4.1
 ## 04/19/2017
diff --git a/themes/grav/templates/forms/fields/pages/pages.html.twig b/themes/grav/templates/forms/fields/pages/pages.html.twig
index 63a69c3b..4ba41cf3 100644
--- a/themes/grav/templates/forms/fields/pages/pages.html.twig
+++ b/themes/grav/templates/forms/fields/pages/pages.html.twig
@@ -27,9 +27,10 @@
     {% set show_all = field.show_all is same as(false) ? false : true %}
     {% set show_fullpath = field.show_fullpath is same as(true) ? true : false %}
     {% set show_slug = field.show_slug is same as(true) ? true : false %}
+    {% set show_modular = field.show_modular is same as(true) ? true : false %}
     {% set limit_levels = field.limit_levels ?: false %}
 
-    {% set page_list = grav.pages.getList(start_page, 0, true, show_all, show_fullpath, show_slug, limit_levels) %}
+    {% set page_list = grav.pages.getList(start_page, 0, true, show_all, show_fullpath, show_slug, show_modular, limit_levels) %}
 
     <div class="form-select-wrapper {{ field.size }}">
         <select class="{{ field.classes }}" name="{{ (scope ~ field.name)|fieldName ~ (field.multiple ? '[]' : '') }}"
diff --git a/themes/grav/templates/forms/fields/parents/parents.html.twig b/themes/grav/templates/forms/fields/parents/parents.html.twig
index e3866a2f..c037ae62 100644
--- a/themes/grav/templates/forms/fields/parents/parents.html.twig
+++ b/themes/grav/templates/forms/fields/parents/parents.html.twig
@@ -2,7 +2,7 @@
 
 {% block input %}
     {% set last_page_route = admin.page.getLastPageRoute %}
-    {% set defaults = {show_root:true, show_all:true, show_slug:true, default: last_page_route} %}
+    {% set defaults = {show_root:true, show_all:true, show_slug:true, default:last_page_route} %}
     {% set field = field|merge(defaults) %}
     {{ parent() }}
 {% endblock %}