Merge branch 'feature/1.7' of github.com:getgrav/grav-plugin-admin into feature/1.7

CHANGELOG.md

@@ -8,6 +8,7 @@
     * Rolled back JS to known working versions [#1323](https://github.com/getgrav/grav-plugin-admin/issues/1323)
     * Fixed missing translation in order field [#1324](https://github.com/getgrav/grav-plugin-admin/issues/1324)
     * Fixed UI issue with last drop-down in button group [1325](https://github.com/getgrav/grav-plugin-admin/issues/1325)
+    * Fixed fieldset field outdated rendering [#1313](https://github.com/getgrav/grav-plugin-admin/issues/1313)
 
 # v1.7.0-rc.2
 ## 01/24/2018

themes/grav/templates/forms/fields/fieldset/fieldset.html.twig

@@ -54,21 +54,38 @@
               {% endif %}
 
               {% if field.fields %}
-                  {%- for childName, child in field.fields -%}
+                  {% for childName, child in field.fields %}
-                      {%- if childName starts with '.' -%}
+                      {%- if childName == 'value' -%}
-                          {%- set childKey = childName|trim('.') -%}
+                          {% set childKey = '' %}
-                          {%- set childName = itemName ~ childName -%}
+                          {% set childName = itemName -%}
-                      {%- else %}
+                      {%- elseif childName starts with '.' -%}
-                          {%- set childKey = childName -%}
+                          {% set childKey = childName|trim('.') %}
-                          {%- set childName = childName|replace({'*': key}) -%}
+                          {% set childName = itemName ~ childName %}
-                      {%- endif %}
+                      {% else %}
-                      {%- set child = child|merge({ name: childName }) -%}
+                          {% set childKey = childName %}
+                          {% set childName = childName|replace({'*': key}) %}
+                      {% endif %}
+                      {% set child = child|merge({ name: childName }) %}
 
-                      {% if field.type %}
+                      {% if child.type == 'key' %}
-                          {%- include [
+                          {%
+                              include 'forms/fields/key/key.html.twig'
+                              with { field: child, value: key }
+                          %}
+                      {% elseif child.key == true %}
+                          {% include [
+                              "forms/fields/#{child.type}/#{child.type}.html.twig",
+                              'forms/fields/key/key.html.twig'
+                              ] with { field: child, value: key }
+                          %}
+                      {% elseif child.type %}
+                          {% set originalValue = data.value(child.name) %}
+                          {%
+                              include [
                               "forms/fields/#{child.type}/#{child.type}.html.twig",
                               'forms/fields/text/text.html.twig'
-                          ] with { field: child, value: data.value(child.name) } -%}
+                              ] with { field: child, value: data.value(child.name) }
+                          %}
                       {% endif %}
                   {% endfor %}
               {% endif %}