Merge branch 'release/1.0.13'

trilbymedia · Jun 3, 2021 · 03b2594 · 03b2594
2 parents ee99992 + b34aa13
commit 03b2594
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.13
+## 06/03/2021
+
+1. [](#bugfix)
+   * Fixed expert mode for Flex Pages
+
 # v1.0.12
 ## 06/02/2021
 

diff --git a/admin/templates/flex-objects/types/pages/edit.html.twig b/admin/templates/flex-objects/types/pages/edit.html.twig
@@ -1,9 +1,9 @@
 {% extends 'flex-objects/types/default/edit.html.twig' %}
 
 {# Avoid defining form and object twice: object should always come from the form! #}
-{% if form is not defined %}
-    {% set form = object.form(user.authorize('admin.super') and admin.session.expert != '0' ? 'raw') %}
-    {% set form = object.form %}
+{% set expert = user.authorize('admin.super') and admin.session.expert != '0' %}
+{% if expert or form is not defined %}
+    {% set form = object.form(expert ? 'raw' : '') %}
     {% set object = form.object %}
 {% endif %}
 
@@ -170,9 +170,9 @@
         {% set expertText = macro.spanToggle(expertText, maxLen) %}
 
         <div class="switch-toggle switch-grav">
-            <input type="radio" value="normal" data-leave-url="{{ route.withGravParam('mode', 'normal').toString(true) }}" id="normal" name="mode-switch" class="highlight" {% if admin.session.expert == '0' %} checked="checked"{% endif %}>
+            <input type="radio" value="normal" data-leave-url="{{ route.withGravParam('mode', 'normal').toString(true) }}" id="normal" name="mode-switch" class="highlight" {% if expert == '0' %} checked="checked"{% endif %}>
             <label for="normal">{{ normalText }}</label>
-            <input type="radio" value="expert" data-leave-url="{{ route.withGravParam('mode', 'expert').toString(true) }}" id="expert" name="mode-switch" class="highlight" {% if admin.session.expert == '1' %} checked="checked"{% endif %}>
+            <input type="radio" value="expert" data-leave-url="{{ route.withGravParam('mode', 'expert').toString(true) }}" id="expert" name="mode-switch" class="highlight" {% if expert == '1' %} checked="checked"{% endif %}>
             <label for="expert">{{ expertText }}</label>
             <a></a>
         </div>

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Flex Objects
 slug: flex-objects
 type: plugin
-version: 1.0.12
+version: 1.0.13
 description: Flex Objects plugin allows you to manage Flex Objects in Grav Admin.
 icon: list-alt
 author: