Skip to content

5.0.1 forwardport #1279

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 36 commits into from
Dec 29, 2022
Merged

5.0.1 forwardport #1279

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0d5fcc1
I added conditional logic to test if the given variable is null, if n…
Mgonzalez-droid Sep 26, 2022
69e4e3c
Update src/com/magento/idea/magento2plugin/actions/generation/dialog/…
Mgonzalez-droid Sep 26, 2022
5f905a1
fixed broken commit to code, resolved issue and addressed new simpler…
Mgonzalez-droid Sep 28, 2022
0e99f4b
5.0.1-develop initial
Dec 16, 2022
0b82725
1220: avoid indexing not existing plugin classes
Dec 17, 2022
ddba3cb
1220: updated CHANGELOG.md
Dec 17, 2022
2577b00
1220: updated statement
Dec 17, 2022
eb4d524
Merge pull request #1266 from magento/1220_not_index_no_psi_plugins
VitaliyBoyko Dec 17, 2022
96e0034
1220: fixed PluginIndex
VitaliyBoyko Dec 17, 2022
a390ffa
Merge pull request #1267 from magento/fixed_index_statement
VitaliyBoyko Dec 17, 2022
9aefdea
1226: fixed issue with visible delete button in the new entity form
Dec 17, 2022
fe8469f
1226: updated CHANGELOG.md
Dec 17, 2022
3590581
Merge branch '5.0.1-develop' into 1226-delete-button-visible
VitaliyBoyko Dec 17, 2022
8ad2e4f
1226: added line
Dec 17, 2022
ce9d2b2
Merge remote-tracking branch 'origin/1226-delete-button-visible' into…
Dec 17, 2022
14674c5
1226: fixed tests
VitaliyBoyko Dec 17, 2022
f3f7cfd
Merge pull request #1268 from magento/1226-delete-button-visible
VitaliyBoyko Dec 18, 2022
813c6e1
Merge branch '5.0.1-develop' into 4.4.1-develop-add-NPE-check-2
VitaliyBoyko Dec 18, 2022
55f6e9d
Removed unnecessary else statement
VitaliyBoyko Dec 18, 2022
0621a8a
1213: adjusted CHANGELOG.md
Dec 18, 2022
f627f33
1213: static fix
Dec 18, 2022
2b39dde
Merge pull request #1213 from Mgonzalez-droid/4.4.1-develop-add-NPE-c…
VitaliyBoyko Dec 18, 2022
f6ec3e3
1269: fixed AWT events are not allowed inside write action
VitaliyBoyko Dec 23, 2022
94d4456
1269: static fix
VitaliyBoyko Dec 23, 2022
8a20410
1215: fix parsing of plugin sort order value [backport 5.0.1]
VitaliyBoyko Dec 23, 2022
461da9b
1215: patch
VitaliyBoyko Dec 23, 2022
34979cc
Merge pull request #1271 from magento/1269-awt-events
VitaliyBoyko Dec 23, 2022
5571554
Merge remote-tracking branch 'origin/5.0.1-develop' into 1215_fix_par…
VitaliyBoyko Dec 23, 2022
163096d
1227: fix Create an entity - The translation function is not call on …
VitaliyBoyko Dec 23, 2022
578474c
1227: adjusted CHANGELOG.md
VitaliyBoyko Dec 23, 2022
c3d701f
Merge pull request #1272 from magento/1215_fix_parsing_of_plugin_sort…
VitaliyBoyko Dec 23, 2022
2b08768
Merge branch '5.0.1-develop' into 1227_Create_an_entity_-_The_transla…
VitaliyBoyko Dec 23, 2022
24bd90f
Merge pull request #1273 from magento/1227_Create_an_entity_-_The_tra…
VitaliyBoyko Dec 23, 2022
5df615d
1277: fixed throwable and wrapButtonSettings function call
VitaliyBoyko Dec 28, 2022
051d406
Merge pull request #1278 from magento/1277-fixed-missing-import
VitaliyBoyko Dec 28, 2022
cfa711e
Merge branch '5.1.0-develop' of github.com:magento/magento2-phpstorm-…
Dec 28, 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
Prev Previous commit
Next Next commit
Update src/com/magento/idea/magento2plugin/actions/generation/dialog/… 
…InjectAViewModelDialog.java

Co-authored-by: bohdan-harniuk <31848341+bohdan-harniuk@users.noreply.github.com>
  • Loading branch information
@Mgonzalez-droid @bohdan-harniuk
Mgonzalez-droid and bohdan-harniuk authored Sep 26, 2022
commit 69e4e3c2783d2711ec672e95f428a072fa48bbe3
8 changes: 7 additions & 1 deletion src/com/magento/idea/magento2plugin/actions/generation/dialog/InjectAViewModelDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,13 @@ protected void onOK() {
exit();
return;
}
if(targetBlockTag.getContainingFile() != null &&
if (targetBlockTag.getContainingFile() == null || targetBlockTag.getContainingFile().getParent() == null) {
return;
}
final String moduleName = GetModuleNameByDirectoryUtil.execute(
targetBlockTag.getContainingFile().getParent(),
project
);
targetBlockTag.getContainingFile().getParent() != null) {
final String moduleName = GetModuleNameByDirectoryUtil.execute(
targetBlockTag.getContainingFile().getParent(),
Expand Down