Merge branch 'release/1.0.12'

trilbymedia · Jun 2, 2021 · ee99992 · ee99992
2 parents 45f3028 + 37aed6c
commit ee99992
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v1.0.12
+## 06/02/2021
+
+1. [](#bugfix)
+   * Fixed logic to get form blueprints and object, prevents events from being fired twice
+   * Fixed breadcrumb item in Pages list not translating HTML entities [#127](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/127)
+
 # v1.0.11
 ## 05/24/2021
 

diff --git a/admin/templates/flex-objects/types/default/edit.html.twig b/admin/templates/flex-objects/types/default/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends 'partials/base.html.twig' %}
 {% use 'flex-objects/types/default/titlebar/edit.html.twig' %}
 
-{% set form = form ?? object.form %}
+{# Avoid defining form and object twice: object should always come from the form! #}
+{% if form is not defined %}
+  {% set form = object.form %}
+  {% set object = form.object %}
+{% endif %}
 
 {# Allowed actions #}
 {% set can_list = can_list ?? directory.isAuthorized('list', 'admin', user) %}
@@ -51,7 +55,7 @@
 {% block body %}
     {% set back_url = back_url ?? admin_route(back_route) %}
     {% set id = key %}
-    {% set blueprint = blueprint ?? object.blueprint ?? directory.blueprint %}
+    {% set blueprint = blueprint ?? form.blueprint %}
 
     {{ parent() }}
 {% endblock body %}

diff --git a/admin/templates/flex-objects/types/pages/edit.html.twig b/admin/templates/flex-objects/types/pages/edit.html.twig
@@ -1,6 +1,11 @@
 {% extends 'flex-objects/types/default/edit.html.twig' %}
 
-{% set form = form ?? object.form(user.authorize('admin.super') and admin.session.expert != '0' ? 'raw') %}
+{# 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 object = form.object %}
+{% endif %}
 
 {% set title = title ?? form.getValue('header.title') ?? object.title ?? key %}
 {% set parent = object.parent %}

diff --git a/app/utils/finder.js b/app/utils/finder.js
@@ -336,7 +336,7 @@ class Finder {
             this.pathBar.append(`
                 <span class="breadcrumb-node ${item.icon}" ${item.type === 'dir' || item.child_count > 0 ? `data-breadcrumb-node="${itemKeys}"` : ''}>
                     <i class="${item.icon}"></i>
-                    <span class="breadcrumb-node-name">${$('<div />').text(item[this.config.labelKey]).html()}</span>
+                    <span class="breadcrumb-node-name">${$('<div />').html(item[this.config.labelKey]).html()}</span>
                     ${!isLast ? '<i class="fa fa-fw fa-chevron-right"></i>' : ''}
                 </span>
             `);

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

diff --git a/js/flex-objects.js b/js/flex-objects.js