Merge branch '2.4-develop' into Refactoring-AdminEditRelatedBundlePro…

…ductTest
magento · Sep 16, 2021 · 220b556 · 220b556
2 parents d063a34 + f649184
commit 220b556
Show file tree

Hide file tree

Showing 64 changed files with 149 additions and 149 deletions.
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html b/app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html
@@ -9,21 +9,21 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
         <div class="message-system-collapsible">
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>

diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
@@ -9,21 +9,21 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
         <div class="message-system-collapsible">
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>

diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -11,7 +11,7 @@
     </div>
 
     <div class="admin__field-complex-elements">
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
         <button attr="{disabled: disabled}"
                 class="action-secondary"
                 type="button"

diff --git a/app/code/Magento/Bundle/view/base/web/template/product/final_price.html b/app/code/Magento/Bundle/view/base/web/template/product/final_price.html
@@ -7,27 +7,27 @@
 <if args="hasPriceRange($row())">
     <div class="price-from">
         <with args="getPriceByCode('minimal_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
         <with args="getPriceByCode('minimal_regular_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
     </div>
     <div class="price-to">
         <with args="getPriceByCode('max_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
         <with args="getPriceByCode('max_regular_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
     </div>
 </if>
 
 <ifnot args="hasPriceRange($row())">
     <with args="getPriceByCode('minimal_price')">
-        <render args="getBody()" />
+        <render args="getBody()" ></render>
     </with>
     <with args="getPriceByCode('minimal_regular_price')">
-        <render args="getBody()" />
+        <render args="getBody()" ></render>
     </with>
 </ifnot>
diff --git a/app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html b/app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html
@@ -19,7 +19,7 @@
               html="getMinimalPriceUnsanitizedHtml($row())"></span>
 
         <each args="data: getAdjustments(), as: '$adj'">
-                <render args="$adj.getBody()"/>
+                <render args="$adj.getBody()"></render>
         </each>
     </span>
 </if>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html b/app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html
@@ -10,7 +10,7 @@
         <span text="label"></span>
     </li>
     <li class="attributes-found">
-        <text args="totalRecords"/> records found
-        <text args="'(' + totalSelected + ' selected)'" if="totalSelected"/>
+        <text args="totalRecords"></text> records found
+        <text args="'(' + totalSelected + ' selected)'" if="totalSelected"></text>
     </li>
 </ul>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html
@@ -13,10 +13,10 @@
     </label>
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
-        <render args="elementTmpl" ifnot="hasAddons()"/>
+        <render args="elementTmpl" ifnot="hasAddons()"></render>
 
         <div class="admin__control-addon" if="hasAddons()">
-            <render args="elementTmpl"/>
+            <render args="elementTmpl"></render>
 
             <label class="admin__addon-prefix" if="addBefore()" attr="for: uid">
                 <span text="addBefore()"></span>
@@ -26,9 +26,9 @@
             </label>
         </div>
 
-        <render args="tooltipTpl" if="$data.tooltip"/>
+        <render args="tooltipTpl" if="$data.tooltip"></render>
 
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
 
         <label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
 
@@ -42,6 +42,6 @@
             <!-- /ko -->
         <!-- /ko -->
 
-        <render args="$data.service.template" if="$data.hasService()"/>
+        <render args="$data.service.template" if="$data.hasService()"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
@@ -33,7 +33,7 @@
 
     <div class="file-uploader-filename" text="$file.name"></div>
     <div class="file-uploader-meta">
-        <text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>,
-        <text args="$parent.formatSize($file.size)"/>
+        <text args="$file.previewWidth"></text>x<text args="$file.previewHeight"></text>,
+        <text args="$parent.formatSize($file.size)"></text>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html b/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
@@ -17,35 +17,35 @@
                 <li class="product-item" repeat="foreach: filteredRows, item: '$row'">
                     <div class="product-item-info">
                         <fastForEach args="data: getRegion('general-area'), as: '$col'" >
-                            <render args="$col.getBody()"/>
+                            <render args="$col.getBody()"></render>
                         </fastForEach>
 
                         <div class="product-item-details">
                             <fastForEach args="data: getRegion('details-area'), as: '$col'" >
-                                <render args="$col.getBody()"/>
+                                <render args="$col.getBody()"></render>
                             </fastForEach>
 
                             <div if="regionHasElements('action-primary-area') || regionHasElements('action-secondary-area')"
                                  class="product-item-actions">
                                 <div class="actions-primary" if="regionHasElements('action-primary-area')">
                                     <fastForEach args="data: getRegion('action-primary-area'), as: '$col'" >
-                                        <render args="$col.getBody()"/>
+                                        <render args="$col.getBody()"></render>
                                     </fastForEach>
                                 </div>
 
                                 <div if="regionHasElements('action-secondary-area')"
                                      class="actions-secondary"
                                      data-role="add-to-links">
                                     <fastForEach args="data: getRegion('action-secondary-area'), as: '$col'" >
-                                        <render args="$col.getBody()"/>
+                                        <render args="$col.getBody()"></render>
                                     </fastForEach>
                                 </div>
                             </div>
 
                             <div if="regionHasElements('description-area')"
                                  class="product-item-description">
                                 <fastForEach args="data: getRegion('description-area'), as: '$col'" >
-                                    <render args="$col.getBody()"/>
+                                    <render args="$col.getBody()"></render>
                                 </fastForEach>
                             </div>
                         </div>

diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html b/app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html
@@ -19,7 +19,7 @@
           html="getMaxPriceUnsanitizedHtml($row())"></span>
 
     <each args="data: getAdjustments('max_price'), as: '$adj'">
-        <render args="$adj.getBody()"/>
+        <render args="$adj.getBody()"></render>
     </each>
 </span>
 
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html b/app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html
@@ -8,7 +8,7 @@
      if="isAllowed()">
     <each args="data: getPrices($row()), as: '$price'">
         <with args="$price">
-            <render args="getBody()"/>
+            <render args="getBody()"></render>
         </with>
     </each>
 </div>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html b/app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html
@@ -5,5 +5,5 @@
  */
 -->
 <with args="getPrice($row())">
-    <render args="getBody()"/>
+    <render args="getBody()"></render>
 </with>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html b/app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html
@@ -22,7 +22,7 @@
 
                 <if args="!hasSpecialPrice($row())">
                     <each args="data: getAdjustments(), as: '$adj'">
-                        <render args="$adj.getBody()"/>
+                        <render args="$adj.getBody()"></render>
                     </each>
                 </if>
             </span>

diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html b/app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html
@@ -20,7 +20,7 @@
                   html="getPriceUnsanitizedHtml($row())"></span>
 
             <each args="data: getAdjustments(), as: '$adj'">
-                <render args="$adj.getBody()"/>
+                <render args="$adj.getBody()"></render>
             </each>
         </span>
     </span>

diff --git a/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html b/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html
@@ -17,7 +17,7 @@
 
     <if args="isAvailable($row()) === false">
         <div class="stock unavailable">
-            <text args="$t('Availability')"/>
+            <text args="$t('Availability')"></text>
             <span translate="'Out of stock'"></span>
         </div>
     </if>

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -10,9 +10,9 @@
          class="step-content"
          data-role="content">
 
-        <each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" />
-        <each args="getRegion('address-list')" render="" />
-        <each args="getRegion('address-list-additional-addresses')" render="" />
+        <each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" ></each>
+        <each args="getRegion('address-list')" render="" ></each>
+        <each args="getRegion('address-list-additional-addresses')" render="" ></each>
 
         <!-- Address form pop up -->
         <if args="!isFormInline">
@@ -29,10 +29,10 @@
                  render="shippingFormTemplate"></div>
         </if>
 
-        <each args="getRegion('before-form')" render="" />
+        <each args="getRegion('before-form')" render="" ></each>
 
         <!-- Inline address form -->
-        <render if="isFormInline" args="shippingFormTemplate"/>
+        <render if="isFormInline" args="shippingFormTemplate"></render>
     </div>
 </li>
 
@@ -46,7 +46,7 @@
              translate="'Shipping Methods'"
              data-role="title"></div>
 
-        <each args="getRegion('before-shipping-method-form')" render="" />
+        <each args="getRegion('before-shipping-method-form')" render="" ></each>
 
         <div id="checkout-step-shipping_method"
              class="step-content"
@@ -59,10 +59,10 @@
                   submit="setShippingInformation"
                   novalidate="novalidate">
 
-                <render args="shippingMethodListTemplate"/>
+                <render args="shippingMethodListTemplate"></render>
 
                 <div id="onepage-checkout-shipping-method-additional-load">
-                    <each args="getRegion('shippingAdditional')" render="" />
+                    <each args="getRegion('shippingAdditional')" render="" ></each>
                 </div>
                 <div role="alert"
                      if="errorValidationMessage().length"

diff --git a/...ode/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html b/...ode/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html
@@ -14,7 +14,7 @@
         <img class="file-uploader-image" attr="src: $data.thumbnailUrl()"/>
         <!-- /ko -->
         <!-- ko if: !$data.processedFile().url && !$data.thumbnail() -->
-        <text args="$data.processedFile().name"/>
+        <text args="$data.processedFile().name"></text>
         <!-- /ko -->
         <div class="file-uploader-area">
             <input type="file"

diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html b/app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html
@@ -20,7 +20,7 @@
         </ifnot>
 
         <each args="data: getAdjustments(), as: '$adj'">
-            <render args="$adj.getBody()"/>
+            <render args="$adj.getBody()"></render>
         </each>
     </ifnot>
 </span>
diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
@@ -8,46 +8,46 @@
     <div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
         <address>
             <div class="address_caption">
-                <text args="title"/>
+                <text args="title"></text>
                 <each args="data: elems, as: 'element'">
-                    <render if="hasTemplate()"/>
+                    <render if="hasTemplate()"></render>
                 </each>
             </div>
             <div class="address_details" ifnot="_.isEmpty($data.address)">
-                <text args="address.prefix" if="address.prefix"/>
-                <text args="address.firstname"/>
-                <text args="address.middlename" if="address.middlename"/>
-                <text args="address.lastname"/>
-                <text args="address.suffix" if="address.suffix"/>
+                <text args="address.prefix" if="address.prefix"></text>
+                <text args="address.firstname"></text>
+                <text args="address.middlename" if="address.middlename"></text>
+                <text args="address.lastname"></text>
+                <text args="address.suffix" if="address.suffix"></text>
                 <br/>
                 <if args="address.company">
-                    <text args="address.company"/>
+                    <text args="address.company"></text>
                     <br/>
                 </if>
                 <if args="address.street">
-                    <text args="address.street" if="_.isString(address.street)"/>
+                    <text args="address.street" if="_.isString(address.street)"></text>
                     <text args="_.filter(_.values(address.street), function (value) { return _.isString(value)}).join(', ')"
-                          ifnot="_.isString(address.street)"/>
+                          ifnot="_.isString(address.street)"></text>
                     <br/>
                 </if>
-                <text args="address.city + ', '" if="address.city"/>
-                <text args="address.region + ', '" if="address.region"/>
+                <text args="address.city + ', '" if="address.city"></text>
+                <text args="address.region + ', '" if="address.region"></text>
                 <if args="address.postcode">
-                    <text args="address.postcode"/>
+                    <text args="address.postcode"></text>
                     <br/>
                 </if>
-                <text args="address.country"/>
+                <text args="address.country"></text>
                 <if args="address.telephone">
                     <br/>T: <a attr="href: 'tel:' + address.telephone" text="address.telephone"></a>
                 </if>
                 <if args="address.fax">
-                    <br/>F: <text args="address.fax"/>
+                    <br/>F: <text args="address.fax"></text>
                 </if>
                 <if args="address.vat_id">
-                    <br/>VAT: <text args="address.vat_id"/>
+                    <br/>VAT: <text args="address.vat_id"></text>
                 </if>
             </div>
-            <translate args="notExistsMessage" if="_.isEmpty($data.address)"/>
+            <translate args="notExistsMessage" if="_.isEmpty($data.address)"></translate>
         </address>
     </div>
 </div>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html b/app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html
@@ -11,8 +11,8 @@
             <div class="file-uploader-summary">
                 <div class="file-uploader-filename">
                     <!-- ko if: $file.url --><a attr="href: $file.url" target="_blank" text="$file.name"></a><!-- /ko -->
-                    <!-- ko if: !$file.url --><text args="$file.name"/><!-- /ko -->
-                    (<text args="$parent.formatSize($file.size)"/>)
+                    <!-- ko if: !$file.url --><text args="$file.name"></text><!-- /ko -->
+                    (<text args="$parent.formatSize($file.size)"></text>)
                 </div>
             </div>
         </each>

diff --git a/app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html b/app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html
@@ -18,7 +18,7 @@
                   html="getPriceUnsanitizedHtml($row())"></span>
 
             <each args="data: getAdjustments(), as: '$adj'">
-                <render args="$adj.getBody()"/>
+                <render args="$adj.getBody()"></render>
             </each>
         </span>
     </div>