From f949199ad4121548f369128fcd508615e38618a3 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sun, 8 Mar 2020 23:17:07 +0300
Subject: [PATCH] fix(admin-plugin): fix incorrect data merging of manifest and
 settings for plugins and themes #404

---
 site/plugins/admin/templates/extends/themes/index.html | 10 +++++-----
 .../plugins/admin/templates/system/tools/registry.html |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/site/plugins/admin/templates/extends/themes/index.html b/site/plugins/admin/templates/extends/themes/index.html
index cc5b165d..a5dbf2a2 100644
--- a/site/plugins/admin/templates/extends/themes/index.html
+++ b/site/plugins/admin/templates/extends/themes/index.html
@@ -28,13 +28,13 @@
                             <i class="icon">{{ icon('fas fa-palette') }}</i>
                         </td>
                         <td class="pl-0 {% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">
-                            <a href="{{ path_for('admin.templates.index') }}?theme={{ key }}">{{ theme.name }}</a>
+                            <a href="{{ path_for('admin.templates.index') }}?theme={{ key }}">{{ theme.manifest.name }}</a>
                         </td>
-                        <td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.description }}</td>
+                        <td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.manifest.description }}</td>
                         <td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">
-                            <a href="{{ theme.author.url }}" target="_blank">{{ theme.author.name }}</a>
+                            <a href="{{ theme.author.url }}" target="_blank">{{ theme.manifest.author.name }}</a>
                         </td>
-                        <td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.version }}</td>
+                        <td class="{% if key == registry.flextype.theme %}{% else %}opacity-50{% endif %}">{{ theme.manifest.version }}</td>
                         <td class="text-right">
                             <button type="button" class="js-dropdown-btn" data-dropdown="dropdown-{{ key }}">
                                 <i class="icon">{{ icon('fas fa-ellipsis-h') }}</i>
@@ -72,4 +72,4 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/system/tools/registry.html b/site/plugins/admin/templates/system/tools/registry.html
index 7ba0f0c2..7cd3ea4b 100644
--- a/site/plugins/admin/templates/system/tools/registry.html
+++ b/site/plugins/admin/templates/system/tools/registry.html
@@ -15,10 +15,12 @@
                         {{ key }}
                     </td>
                     <td>
-                        {{ value }}
+                        {% if value is not iterable %}
+                            {{ value }}
+                        {% endif %}
                     </td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
-{% endblock %}
\ No newline at end of file
+{% endblock %}