Merge branch 'release/1.0.15'

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v1.0.15
+## 06/16/2021
+
+1. [](#improved)
+   * Better checks against missing Flex Type inside tasks
+   * Better authorization checks, falls back to directory level authorization checks if objects do not support authorization
+1. [](#bugfix)
+   * Fixed missing handling of child_type in Flex Pages [getgrav/grav-plugin-admin#2087](https://github.com/getgrav/grav-plugin-admin/issues/2087)
+   * Added support for multiple `Exports` in a dropdown
+   * Admin is no longer a dependency of Flex Objects [#130](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/130)
+   * Fixed authorization checks during page creation for users who have limited access to some pages [getgrav/grav#3382](https://github.com/getgrav/grav/issues/3382)
+   * Fixed permission check when moving a page [getgrav/grav#3382](https://github.com/getgrav/grav/issues/3382)
+
 # v1.0.14
 ## 06/07/2021
 

admin/templates/flex-objects/types/default/buttons/export.html.twig

@@ -1,3 +1,21 @@
-<a id="titlebar-button-back" class="button" href="{{ route.withGravParam('', 'export') }}">
+{% if export.options %}
+    <div id="titlebar-button-export" class="button-group">
+        <button id="titlebar-button-export" type="button" class="button dropdown-toggle" data-toggle="dropdown">
+            <i class="fa fa-download"></i> {{ 'PLUGIN_ADMIN.EXPORT'|tu }} <i class="fa fa-caret-down"></i>
+        </button>
+        <ul class="dropdown-menu lang-switcher">
+            {% for type,option in export.options %}
+                <li>
+                    <a id="titlebar-button-export" class="button" href="{{ route.withGravParam('', 'export').withQueryParam('type', type) }}">
+                        {{ option.title|tu }}
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    </div>
+
+{% else %}
+<a id="titlebar-button-export" class="button" href="{{ route.withGravParam('', 'export') }}">
     <i class="fa fa-download"></i> {{ export.title ?? (export.formatter.class ? 'PLUGIN_ADMIN.EXPORT'|tu : 'PLUGIN_FLEX_OBJECTS.CSV'|tu) }}
 </a>
+{% endif %}

admin/templates/flex-objects/types/pages/edit.html.twig

@@ -192,7 +192,7 @@
     {% if object.exists %}
         {% set modal_data = data({
             route: '/' ~ object.key,
-            name: object.header.child_type ?? null
+            name: object.header.child_type ?? object.blueprint.child_type ?? 'default'
         }) %}
 
         <div class="remodal" data-remodal-id="modal" data-remodal-options="hashTracking: false, closeOnOutsideClick: false">

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Flex Objects
 slug: flex-objects
 type: plugin
-version: 1.0.14
+version: 1.0.15
 description: Flex Objects plugin allows you to manage Flex Objects in Grav Admin.
 icon: list-alt
 author:
@@ -15,7 +15,6 @@ license: MIT
 
 dependencies:
     - { name: grav, version: '>=1.7.10' }
-    - { name: admin, version: '>=1.7.13' }
     - { name: form, version: '>=5.0.2' }
 
 form: