From 342099f73f4c9635d6c196a85344f2ad1ace9298 Mon Sep 17 00:00:00 2001
From: Ryan Boog <ryan@hdwebpros.com>
Date: Fri, 24 Aug 2018 10:46:44 -0500
Subject: [PATCH 1/2] Fixed multiple select optgroup selected bug

---
 .../forms/fields/select_optgroup/select_optgroup.html.twig   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/forms/fields/select_optgroup/select_optgroup.html.twig b/templates/forms/fields/select_optgroup/select_optgroup.html.twig
index dae4348f..b4e994d7 100644
--- a/templates/forms/fields/select_optgroup/select_optgroup.html.twig
+++ b/templates/forms/fields/select_optgroup/select_optgroup.html.twig
@@ -22,7 +22,8 @@
                     data-key-observe="{{ (scope ~ field.name)|fieldName }}"
                 {% endif %}
                 >
-            {% if field.placeholder %}<option value="" disabled selected>{% if grav.twig.twig.filters['tu'] is defined %}{{ field.placeholder|tu|raw }}{% else %}{{ field.placeholder|t|raw }}{% endif %}</option>{% endif %}
+                {% set selectedoption = false %}
+            {% if field.placeholder %}<option value="" disabled selected>{% set selectedoption = true %}{% if grav.twig.twig.filters['tu'] is defined %}{{ field.placeholder|tu|raw }}{% else %}{{ field.placeholder|t|raw }}{% endif %}</option>{% endif %}
 
             {% for key, optgroup in field.options %}
                 {% set optgroup_label = optgroup|keys|first %}
@@ -31,7 +32,7 @@
                 {%for subkey, suboption in field.options[key][optgroup_label] %}
                 {% set selected = field.selectize ? suboption : subkey %}
                 {% set item_value = field.selectize and field.multiple ? suboption : subkey %}
-                    <option {% if subkey == value or (field.multiple and selected in value) %}selected="selected"{% endif %} value="{{ suboption }}">
+                    <option {% if selectedoption == false subkey == value or (field.multiple and selected in value) %}{% set selectedoption = true %}selected="selected"{% endif %} value="{{ suboption }}">
                         {% if grav.twig.twig.filters['tu'] is defined %}
                         {{ suboption|tu|raw }}{% else %}{{ suboption|t|raw }}
                         {% endif %}

From 8b2da10c73056923dc81b72792d9d9f71e7f6d7d Mon Sep 17 00:00:00 2001
From: Ryan Boog <ryan@hdwebpros.com>
Date: Fri, 24 Aug 2018 11:17:56 -0500
Subject: [PATCH 2/2] Update select_optgroup.html.twig

Forgot the and statement
---
 .../forms/fields/select_optgroup/select_optgroup.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/forms/fields/select_optgroup/select_optgroup.html.twig b/templates/forms/fields/select_optgroup/select_optgroup.html.twig
index b4e994d7..f7164b8e 100644
--- a/templates/forms/fields/select_optgroup/select_optgroup.html.twig
+++ b/templates/forms/fields/select_optgroup/select_optgroup.html.twig
@@ -32,7 +32,7 @@
                 {%for subkey, suboption in field.options[key][optgroup_label] %}
                 {% set selected = field.selectize ? suboption : subkey %}
                 {% set item_value = field.selectize and field.multiple ? suboption : subkey %}
-                    <option {% if selectedoption == false subkey == value or (field.multiple and selected in value) %}{% set selectedoption = true %}selected="selected"{% endif %} value="{{ suboption }}">
+                    <option {% if selectedoption == false and subkey == value or (field.multiple and selected in value) %}{% set selectedoption = true %}selected="selected"{% endif %} value="{{ suboption }}">
                         {% if grav.twig.twig.filters['tu'] is defined %}
                         {{ suboption|tu|raw }}{% else %}{{ suboption|t|raw }}
                         {% endif %}