Allow show_modular: true|false to work again in parents/pages field #1080

This commit is contained in:
Andy Miller
2017-04-21 22:17:35 -06:00
parent 9fe0290e03
commit 7422d39b90
3 changed files with 4 additions and 2 deletions

View File

@@ -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

View File

@@ -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 ? '[]' : '') }}"

View File

@@ -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 %}