fix: admin creating new mail template, fixes #57

FriendsOfShopware · Feb 10, 2024 · 759ab95 · 759ab95
1 parent 0a1379f
commit 759ab95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...c/module/sw-mail-template/component/sw-mail-template-list/sw-mail-template-list.html.twig b/...c/module/sw-mail-template/component/sw-mail-template-list/sw-mail-template-list.html.twig
@@ -49,21 +49,21 @@
             <template #column-froshTemplateMail="{ item }">
                 <sw-label
                     appearance="circle"
-                    :variant="item.extensions.froshTemplateMail.subject ? 'success' : 'warning'"
+                    :variant="item.extensions?.froshTemplateMail.subject ? 'success' : 'warning'"
                     v-tooltip="getFroshTooltip('subject', item.extensions.froshTemplateMail.subject)"
                 >
                     <sw-icon name="regular-exclamation-s" small />
                 </sw-label>
                 <sw-label
                     appearance="circle"
-                    :variant="item.extensions.froshTemplateMail.plain ? 'success' : 'warning'"
+                    :variant="item.extensions?.froshTemplateMail.plain ? 'success' : 'warning'"
                     v-tooltip="getFroshTooltip('plain', item.extensions.froshTemplateMail.plain)"
                 >
                     <sw-icon name="regular-align-left" small />
                 </sw-label>
                 <sw-label
                     appearance="circle"
-                    :variant="item.extensions.froshTemplateMail.html ? 'success' : 'warning'"
+                    :variant="item.extensions?.froshTemplateMail.html ? 'success' : 'warning'"
                     v-tooltip="getFroshTooltip('html', item.extensions.froshTemplateMail.html)"
                 >
                     <sw-icon name="regular-code" small />

diff --git a/...rc/module/sw-mail-template/page/sw-mail-template-detail/sw-mail-template-detail.html.twig b/...rc/module/sw-mail-template/page/sw-mail-template-detail/sw-mail-template-detail.html.twig
@@ -1,6 +1,7 @@
 {% block sw_mail_template_options_form_subject_field %}
     {% parent %}
     <sw-label
+        v-if="mailTemplate.extensions.froshTemplateMail"
         appearance="circle"
         :variant="mailTemplate.extensions.froshTemplateMail.subject ? 'success' : 'warning'"
         v-tooltip="getFroshTooltip('subject', mailTemplate.extensions.froshTemplateMail.subject)"
@@ -12,6 +13,7 @@
 {% block sw_mail_template_mail_text_form_content_plain_field %}
     {% parent %}
     <sw-label
+        v-if="mailTemplate.extensions.froshTemplateMail"
         appearance="circle"
         :variant="mailTemplate.extensions.froshTemplateMail.plain ? 'success' : 'warning'"
         v-tooltip="getFroshTooltip('plain', mailTemplate.extensions.froshTemplateMail.plain)"
@@ -23,6 +25,7 @@
 {% block sw_mail_template_mail_text_form_content_html_field %}
     {% parent %}
     <sw-label
+        v-if="mailTemplate.extensions.froshTemplateMail"
         appearance="circle"
         :variant="mailTemplate.extensions.froshTemplateMail.html ? 'success' : 'warning'"
         v-tooltip="getFroshTooltip('html', mailTemplate.extensions.froshTemplateMail.html)"