Skip to content

1145: Removed content jumping from EAV generators forms #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 6, 2022
Merged

1145: Removed content jumping from EAV generators forms #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0326d43
1145: Removed content jumping from EAV generators forms
bohdan-harniuk Sep 5, 2022
44c8d33
Merge branch '4.4.0-develop' into 1145-removing-content-jumping-from-…
VitaliyBoyko Sep 5, 2022
f69e932
Merge branch '4.4.0-develop' into 1145-removing-content-jumping-from-…
bohdan-harniuk Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .../magento/idea/magento2plugin/actions/generation/dialog/NewCategoryEavAttributeDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
</constraints>
<properties>
<enabled value="true"/>
<preferredSize width="800" height="800"/>
<preferredSize width="800" height="700"/>
</properties>
<border type="none"/>
<children>
<grid id="6fc7e" layout-manager="GridLayoutManager" row-count="16" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="800" height="-1"/>
</grid>
</constraints>
<properties>
<visible value="true"/>
Expand Down Expand Up @@ -334,11 +336,6 @@
</component>
</children>
</grid>
<hspacer id="75d92">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<grid id="181ea" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
Expand Down Expand Up @@ -420,6 +417,11 @@
</component>
</children>
</grid>
<vspacer id="596dd">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>
13 changes: 7 additions & 6 deletions .../magento/idea/magento2plugin/actions/generation/dialog/NewCustomerEavAttributeDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
</constraints>
<properties>
<enabled value="true"/>
<preferredSize width="600" height="700"/>
</properties>
<border type="none"/>
<children>
<grid id="6fc7e" layout-manager="GridLayoutManager" row-count="18" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<visible value="true"/>
Expand Down Expand Up @@ -374,11 +375,6 @@
</component>
</children>
</grid>
<hspacer id="75d92">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<grid id="181ea" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
Expand Down Expand Up @@ -460,6 +456,11 @@
</component>
</children>
</grid>
<vspacer id="5b2c6">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>
30 changes: 15 additions & 15 deletions ...m/magento/idea/magento2plugin/actions/generation/dialog/NewProductEavAttributeDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<grid id="28350" binding="contentPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>
<xy x="-1" y="5" width="764" height="959"/>
<xy x="-1" y="5" width="764" height="997"/>
</constraints>
<properties>
<enabled value="true"/>
Expand All @@ -14,7 +14,7 @@
<grid id="6fc7e" layout-manager="GridLayoutManager" row-count="20" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<visible value="true"/>
Expand Down Expand Up @@ -197,14 +197,6 @@
<text value=""/>
</properties>
</component>
<component id="ab01b" class="javax.swing.JTextField" binding="sourceModelNameTextField">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="c2c06" class="javax.swing.JLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
Expand Down Expand Up @@ -233,6 +225,14 @@
<visible value="false"/>
</properties>
</component>
<component id="ab01b" class="javax.swing.JTextField" binding="sourceModelNameTextField">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
</children>
</grid>
<grid id="27880" binding="applyToPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
Expand Down Expand Up @@ -426,11 +426,6 @@
</component>
</children>
</grid>
<hspacer id="75d92">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<grid id="181ea" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
Expand Down Expand Up @@ -512,6 +507,11 @@
</component>
</children>
</grid>
<vspacer id="bf635">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>
2 changes: 1 addition & 1 deletion ...agento/idea/magento2plugin/actions/generation/dialog/eavattribute/EavAttributeDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ protected void onOk() {
generateDataPatchFile(eavEntityDataInterface);
generateExtraFilesAfterDataPatchGeneration(eavEntityDataInterface);

setVisible(false);
exit();
}

protected void generateSourceModelFile() {
Expand Down