From 680ca92b5c7cf4173f41cc04be4e1256d0d0dfb6 Mon Sep 17 00:00:00 2001 From: skublik Date: Thu, 8 Nov 2018 08:30:32 +0100 Subject: [PATCH] MID-4979 calling of updateTabs function for ConfigurationStep by saving of configuration on NameStep --- .../web/component/wizard/resource/ConfigurationStep.java | 2 +- .../midpoint/web/component/wizard/resource/NameStep.java | 2 ++ .../web/page/admin/resources/PageResourceWizard.java | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java index 5ae6db6aafd..84a18adff51 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java @@ -220,7 +220,7 @@ public WebMarkupContainer getPanel(String panelId) { return tabs; } - private void updateConfigurationTabs() { + public void updateConfigurationTabs() { TabbedPanel tabbedPanel = getConfigurationTabbedPanel(); List tabs = tabbedPanel.getTabs().getObject(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java index 4c961e1b2e7..b08d9a03342 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java @@ -499,5 +499,7 @@ public void applyState() { if (parentPage.showSaveResultInPage(saved, result)) { parentPage.showResult(result); } + + parentPage.getConfigurationStep().updateConfigurationTabs(); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java index 5496440baa3..ecb835a60ec 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java @@ -87,6 +87,7 @@ public class PageResourceWizard extends PageAdminResources { private final boolean configurationOnly; private boolean readOnly; + private ConfigurationStep configurationStep; public PageResourceWizard(@NotNull PageParameters parameters) { getPageParameters().overwriteWith(parameters); // to be available in the methods called within this constructor as well @@ -174,7 +175,8 @@ private void initLayout() { if (!configurationOnly) { wizardModel.add(new NameStep(modelRaw, this)); } - wizardModel.add(new ConfigurationStep(modelNoFetch, this)); + configurationStep = new ConfigurationStep(modelNoFetch, this); + wizardModel.add(configurationStep); if (!configurationOnly) { wizardModel.add(new SchemaStep(modelFull, this)); wizardModel.add(new SchemaHandlingStep(modelFull, this)); @@ -196,6 +198,10 @@ public void refreshIssues(@Nullable AjaxRequestTarget target) { target.add(wizard.getButtons()); } } + + public ConfigurationStep getConfigurationStep() { + return configurationStep; + } @NotNull public ResourceWizardIssuesModel getIssuesModel() { return issuesModel;