From 290f7f7f0a0378a707cec0bf52b341c39e905387 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Fri, 21 Jan 2022 16:45:25 +0200 Subject: [PATCH 1/2] 619: Overriding layouts and templates allows to select an incompatible theme --- .../actions/generation/dialog/OverrideInThemeDialog.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java index 205d5c838..f8e542bdf 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java @@ -131,9 +131,13 @@ public static void open(final @NotNull Project project, final PsiFile psiFile) { } private void fillThemeOptions() { + final String area = psiFile.getVirtualFile().getPath().split("view/")[1].split("/")[0]; final List themeNames = new ModuleIndex(project).getEditableThemeNames(); - for (final String themeName: themeNames) { - theme.addItem(themeName); + final String baseArea = "base"; + for (final String themeName : themeNames) { + if (baseArea.equals(area) || themeName.split("/")[0].equals(area)) { + theme.addItem(themeName); + } } } } From f4fcc48fce2dad45a6f39071af152ab3423aa0b8 Mon Sep 17 00:00:00 2001 From: Serhii Akulov Date: Fri, 21 Jan 2022 17:37:03 +0200 Subject: [PATCH 2/2] 619: fixed code after review --- .../actions/generation/dialog/OverrideInThemeDialog.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java index f8e542bdf..1e3133b53 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java @@ -13,6 +13,7 @@ import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule; import com.magento.idea.magento2plugin.actions.generation.generator.OverrideInThemeGenerator; import com.magento.idea.magento2plugin.indexes.ModuleIndex; +import com.magento.idea.magento2plugin.magento.packages.Areas; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; @@ -133,9 +134,9 @@ public static void open(final @NotNull Project project, final PsiFile psiFile) { private void fillThemeOptions() { final String area = psiFile.getVirtualFile().getPath().split("view/")[1].split("/")[0]; final List themeNames = new ModuleIndex(project).getEditableThemeNames(); - final String baseArea = "base"; + for (final String themeName : themeNames) { - if (baseArea.equals(area) || themeName.split("/")[0].equals(area)) { + if (Areas.base.toString().equals(area) || themeName.split("/")[0].equals(area)) { theme.addItem(themeName); } }