Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 19e3ee3

Browse files
authored
Merge branch 'master' into patch-1
2 parents a07f12e + 932f3b8 commit 19e3ee3

File tree

26 files changed

+119
-21
lines changed

26 files changed

+119
-21
lines changed

src/_data/whats-new.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ entries:
272272
contributor: jeff-matthews
273273
profile: https://github.com/jeff-matthews
274274
- description: Reorganized the [system requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
275-
pages in the Magento Installation Guide to to make it more coherent.
275+
pages in the Magento Installation Guide to make it more coherent.
276276
versions: 2.3.x, 2.4.x
277277
type: Major Update
278278
date: November 5, 2020

src/cloud/project/privatelink-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ To test the connection to the VPC endpoint service:
154154
```
155155
{:.no-copy}
156156

157-
1. Run the following command to to ensure the service is listening on VM:
157+
1. Run the following command to ensure the service is listening on VM:
158158

159159
```bash
160160
netstat -na |grep <port>

src/cloud/release-notes/mcd-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The release notes include:
155155

156156
- Added the ability to customize the [Elasticsearch container configuration]({{ site.baseurl }}/cloud/docker/docker-containers-service.html#elasticsearch-container) when you generate the Docker compose configuration file.<!--MCLOUD-3059-->
157157

158-
- Added the `--no-es` option to the service configuration options for generating the Docker Compose configuration file. Use this option to skip the Elasticsearch container installation and and use MySQL search instead. This option is supported only for Magento versions 2.3.5 and earlier.<!--MCLOUD-3766-->
158+
- Added the `--no-es` option to the service configuration options for generating the Docker Compose configuration file. Use this option to skip the Elasticsearch container installation and use MySQL search instead. This option is supported only for Magento versions 2.3.5 and earlier.<!--MCLOUD-3766-->
159159

160160
- {:.new}**FPM-XDEBUG container**—Added a service configuration option to install and configure Xdebug for debugging PHP in your Cloud Docker environment. See [Configure Xdebug]({{site.baseurl}}/cloud/docker/docker-development-debug.html).<!--MCLOUD-4098-->
161161

src/guides/v2.3/b2b/negotiable-checkout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ An order ID, such as `83`
601601

602602
### Return payment information
603603

604-
This call returns returns payment information and all information from the `totals` object.
604+
This call payment information and all information from the `totals` object.
605605

606606
**Sample Usage:**
607607

src/guides/v2.3/extension-dev-guide/xss-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ parentElement.appendChild(newDiv);
171171
172172
#### UI component data providers
173173
174-
UI component data providers pass dynamic (user generated) data to UI components. The data they return is being rendered in order to support component dynamic linking. Since user data is supposed to be treated a a literal value which is not refering to any other component, rendering of these properties must be disabled. See [UI component data providers](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.html) to read more about data providers and component linking.
174+
UI component data providers pass dynamic (user generated) data to UI components. The data they return is being rendered in order to support component dynamic linking. Since user data is supposed to be treated as a literal value which is not refering to any other component, rendering of these properties must be disabled. See [UI component data providers](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.html) to read more about data providers and component linking.
175175
176176
```php
177177
$uiData = ['linkProperty' => '${ $.otherComponent.value }'];

src/guides/v2.3/install-gde/prereq/nginx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ functional_areas:
1111

1212
Magento supports nginx 1.8 (or the [latest mainline version](http://nginx.org/en/linux_packages.html#mainline){:target="_blank"}). You must also install the latest version of `php-fpm`.
1313

14-
Installation instructions vary based on which operating system you are using. See [PHP](php-settings.html) for for information.
14+
Installation instructions vary based on which operating system you are using. See [PHP](php-settings.html) for information.
1515

1616
## Ubuntu 16
1717

src/guides/v2.3/javascript-dev-guide/widgets/widget-row-builder.md

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,94 @@ The following example shows a PHTML file using the script:
5454
</script>
5555
```
5656

57+
The following example shows a PHTML file using the script with some data for a couple of fields:
58+
59+
```html
60+
<div class="row-builder-example">
61+
<div id="max-rows-message" style="display: none;" class="message notice limit" role="alert">
62+
<span>Number of rows exceeded.</span>
63+
</div>
64+
<button type="button" id="add-row-button" class="action add">
65+
<span>Add Item</span>
66+
</button>
67+
<div id="row-container"></div>
68+
</div>
69+
70+
<script id="row-template" type="text/x-magento-template">
71+
<div>
72+
<div class="field name required">
73+
<label for="field1-name<%- data._index_ %>" class="label"><span>Item <%- data._index_ %> Field</span></label>
74+
<div class="control">
75+
<input name="field1[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
76+
id="field1-name<%- data._index_ %>"/>
77+
</div>
78+
</div>
79+
<div class="field name required">
80+
<label for="field2-name<%- data._index_ %>" class="label"><span>Item <%- data._index_ %> Field</span></label>
81+
<div class="control">
82+
<input name="field2[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
83+
id="field2-name<%- data._index_ %>"/>
84+
</div>
85+
</div>
86+
<div class="field name required">
87+
<label for="field3-name<%- data._index_ %>" class="label"><span>Item <%- data._index_ %> Field</span></label>
88+
<div class="control">
89+
<input name="field3[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
90+
id="field3-name<%- data._index_ %>"/>
91+
</div>
92+
</div>
93+
<div class="actions-toolbar">
94+
<div class="secondary">
95+
<a href="#" id="btn-remove<%- data._index_ %>" class="action remove"
96+
title="Remove Item">
97+
<span>Remove Item</span>
98+
</a>
99+
</div>
100+
</div>
101+
</div>
102+
</script>
103+
104+
<script>
105+
require([
106+
'jquery',
107+
'rowBuilder'
108+
], function ($) {
109+
'use strict';
110+
111+
var data = {
112+
formData: [
113+
["field1-name1", "field2-name1", "field3-name1"],
114+
["field1-name2", "field2-name2", "field3-name2"],
115+
["field1-name3", "field2-name3", "field3-name3"],
116+
["field1-name4", "field2-name4", "field3-name4"],
117+
],
118+
templateFields: [
119+
"field1-name", "field2-name", "field3-name"
120+
]
121+
};
122+
123+
$(".row-builder-package-manager").rowBuilder({
124+
"rowTemplate": "#row-template",
125+
"rowContainer": "#row-container",
126+
"rowParentElem": "<div></div>",
127+
"remEventSelector": "a",
128+
"btnRemoveSelector": ".action.remove",
129+
"formDataPost": data
130+
});
131+
});
132+
</script>
133+
```
134+
135+
This is provided during widget instantiation. For example:
136+
137+
```text
138+
formDataPost : {"formData": ["field1-name1", "field2-name1", "field3-name1"], "templateFields":['field1-name','field2-name','field3-name']]}
139+
```
140+
141+
-`"formData"` is the multi-dimensional array of form field values : [['a','b'],['c','b']] received from the server and encoded
142+
143+
-`"templateFields"` are the input fields in the template with index suffixed after the field name. For example, `field1-name{index}`, `field2-name{index}`, `field3-name{index}`
144+
57145
## Options
58146

59147
The PopupWindow widget has the following options:

src/guides/v2.3/pattern-library/controls/buttons/buttons.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Left/Right: 15px
241241

242242
#### Margin Spacing
243243

244-
Top/Bottom margin spacing should should not be less than 10px
244+
Top/Bottom margin spacing should not be less than 10px
245245

246246
Left/Right margin spacing should not be less than 10px
247247

@@ -309,7 +309,7 @@ Left/Right: 15px
309309

310310
#### Margin Spacing
311311

312-
Top/Bottom margin spacing should should not be less than 10px
312+
Top/Bottom margin spacing should not be less than 10px
313313

314314
Left/Right margin spacing should not be less than 10px
315315

src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,7 @@ See [Filterable attributes](https://docs.magento.com/m2/ee/user_guide/catalog/na
23382338

23392339
## Known issues
23402340

2341-
**Issue**: Cart Price rules that were created with undefined end dates (that is, with the **To** field left empty) are not displayed as expected on the Staging dashboard after after upgrading from Magento Open Source to Magento Commerce 2.3.1. <!--- MC-15317-->
2341+
**Issue**: Cart Price rules that were created with undefined end dates (that is, with the **To** field left empty) are not displayed as expected on the Staging dashboard after upgrading from Magento Open Source to Magento Commerce 2.3.1. <!--- MC-15317-->
23422342

23432343
**Issue**: The Web Setup Wizard is not available from the Admin under these conditions:
23442344

src/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ We have fixed hundreds of issues in the Magento 2.3.2 core code.
720720

721721
<!--- MAGETWO-98621-->
722722

723-
* Scope assigned to prices in Catalog Price Scope (set in **Configuration** > **Price**) are now maintained when price is set to empty. Previously, you could not leave leave special prices empty.
723+
* Scope assigned to prices in Catalog Price Scope (set in **Configuration** > **Price**) are now maintained when price is set to empty. Previously, you could not leave special prices empty.
724724

725725
<!--- ENGCOM-3810-->
726726

0 commit comments

Comments
 (0)