Merge branch 'release/5.1.6'

getgrav · Feb 7, 2022 · 06bd4fe · 06bd4fe
2 parents b6b8371 + 1f894ee
commit 06bd4fe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v5.1.6
+## 02/07/2022
+
+1. [](#bugfix)
+   * Fixed Select field when using OptGroups, not allowing key/values [#541](https://github.com/getgrav/grav-plugin-form/issues/541)
+   * Support for translatable OptGroup labels in Select field [#540](https://github.com/getgrav/grav-plugin-form/issues/540)
+
 # v5.1.5
 ## 01/24/2022
 

diff --git a/app/fields/media.js b/app/fields/media.js
@@ -165,10 +165,10 @@ export default class PageMedia extends FilesField {
         $('.dz-preview').prop('draggable', 'true');
     }
 
-    onDropzoneRemovedFile(file, ...extra) {
-        super.onDropzoneRemovedFile(file, ...extra);
-        this.sortable.options.onSort();
-    }
+    // onDropzoneRemovedFile(file, ...extra) {
+    //     super.onDropzoneRemovedFile(file, ...extra);
+    //     this.sortable.options.onSort();
+    // }
 }
 
 export let Instance = new PageMedia();
diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 5.1.5
+version: 5.1.6
 description: Enables the forms handling
 icon: check-square
 author:

diff --git a/templates/forms/fields/select/select.html.twig b/templates/forms/fields/select/select.html.twig
@@ -51,12 +51,12 @@
                     </option>
                 {% elseif item_value is iterable %}
                     {% set optgroup_label = item_value|keys|first %}
-                    <optgroup label="{{ optgroup_label }}">
+                    <optgroup label="{{ optgroup_label|t|e('html_attr') }}">
                       {% for subkey, suboption in field.options[key][optgroup_label] %}
                           {% set subkey = subkey|string %}
                           {% set item_value = (field.selectize and field.multiple ? suboption : subkey)|string %}
                           {% set selected = (field.selectize ? suboption : subkey)|string %}
-                          <option {% if subkey is same as (value) or (field.multiple and selected in value) %}selected="selected"{% endif %} value="{{ suboption }}">
+                          <option {% if subkey is same as (value) or (field.multiple and selected in value) %}selected="selected"{% endif %} value="{{ subkey }}">
                             {{ suboption|t|raw }}
                           </option>
                       {% endfor %}