Merge branch 'cherry-pick-dff40c55' into '6.4.1.0'

NEXT-15335 - Remove feature flag See merge request shopware/6/product/platform!5360
shopware · May 19, 2021 · 0203605 · 0203605
2 parents a0bf6d3 + aad3d17
commit 0203605
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
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
@@ -276,8 +276,7 @@
                         <sw-sidebar-item icon="default-text-code"
                                          :title="$tc('sw-mail-template.detail.sidebar.titleShowAvailableVariables')"
                                          :disabled="mailTemplate.mailTemplateTypeId === undefined || mailTemplate.mailTemplateTypeId === null"
-                                         class="sw-mail-template-detail__show-available-variables"
-                                         v-if="feature.isActive('FEATURE_NEXT_12654')">
+                                         class="sw-mail-template-detail__show-available-variables">
                             <div class="sw-mail-template-detail__available-variables-sidebar-container">
                                 {% block sw_mail_template_available_variables_tree %}
                                     <sw-tree
@@ -318,8 +317,7 @@
                                          :title="$tc('sw-mail-template.detail.sidebar.titleShowPreview')"
                                          :disabled="showPreview"
                                          class="sw-mail-template-detail__show-preview-sidebar"
-                                         @click="onClickShowPreview"
-                                         v-if="feature.isActive('FEATURE_NEXT_12654')">
+                                         @click="onClickShowPreview">
                         </sw-sidebar-item>
 
                         <sw-sidebar-media-item ref="mediaSidebarItem">

diff --git a/...rces/app/administration/test/module/sw-mail-template/page/sw-mail-template-detail.spec.js b/...rces/app/administration/test/module/sw-mail-template/page/sw-mail-template-detail.spec.js
@@ -63,9 +63,6 @@ const repositoryMockFactory = () => {
 const createWrapper = (privileges = []) => {
     return shallowMount(Shopware.Component.build('sw-mail-template-detail'), {
         provide: {
-            feature: {
-                isActive: () => true
-            },
             repositoryFactory: {
                 create: () => repositoryMockFactory()
             },