Merge branch 'next-34060/no-ips-selectable-in-allowlist-at-sales-chan…

…nel' into 'trunk' NEXT-34060 - No ips selectable in allowlist at sales channel See merge request shopware/6/product/platform!13206
shopware · Mar 4, 2024 · 13d3e73 · 13d3e73
2 parents 01742b4 + c30511f
commit 13d3e73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...nistration/src/module/sw-sales-channel/component/sw-sales-channel-detail-domains/index.js b/...nistration/src/module/sw-sales-channel/component/sw-sales-channel-detail-domains/index.js
@@ -64,7 +64,7 @@ export default {
         },
 
         currentDomainModalTitle() {
-            if (this.currentDomain.isNew()) {
+            if (this.currentDomain?.isNew()) {
                 return this.$t('sw-sales-channel.detail.titleCreateDomain');
             }
 
@@ -74,7 +74,7 @@ export default {
         },
 
         currentDomainModalButtonText() {
-            if (this.currentDomain.isNew()) {
+            if (this.currentDomain?.isNew()) {
                 return this.$t('sw-sales-channel.detail.buttonAddDomain');
             }
             return this.$t('sw-sales-channel.detail.buttonEditDomain');

diff --git a/...sw-sales-channel/view/sw-sales-channel-detail-base/sw-sales-channel-detail-base.html.twig b/...sw-sales-channel/view/sw-sales-channel-detail-base/sw-sales-channel-detail-base.html.twig
@@ -702,7 +702,7 @@
         <!-- eslint-disable-next-line sw-deprecation-rules/no-twigjs-blocks -->
         {% block sw_sales_channel_detail_base_maintenance_ipwhitelist %}
         <sw-multi-tag-ip-select
-            v-model:value="maintenanceIpWhitelist"
+            v-model:value="maintenanceIpAllowlist"
             :is-loading="isLoading"
             :disabled="!acl.can('sales_channel.editor')"
             class="sw-order-user-card__tag-select"