Repository: syncope Updated Branches: refs/heads/2_0_X dc4b83ef1 -> 38ff9d11f refs/heads/master 21ea877bd -> d7fbfe486
Realm is correctly loaded after creation for SYNCOPE-1151 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/38ff9d11 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/38ff9d11 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/38ff9d11 Branch: refs/heads/2_0_X Commit: 38ff9d11fd65181030284a00e585f32b95294507 Parents: dc4b83e Author: Matteo Alessandroni <matteo.alessandr...@tirasa.net> Authored: Thu Jul 13 15:16:45 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Jul 13 15:23:15 2017 +0200 ---------------------------------------------------------------------- .../apache/syncope/client/console/pages/Realms.java | 13 ++++++++----- .../client/console/panels/RealmChoicePanel.java | 8 +++++++- 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/38ff9d11/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java index f5a523d..b801cf3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java @@ -45,6 +45,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; public class Realms extends BasePage { @@ -192,16 +193,18 @@ public class Realms extends BasePage { @Override public void onClose(final AjaxRequestTarget target) { - target.add(realmChoicePanel.reloadRealmTree(target)); - if (modal.getContent() instanceof ResultPage) { Serializable result = ResultPage.class.cast(modal.getContent()).getResult(); - updateRealmContent(RealmTO.class.cast( - ProvisioningResult.class.cast(result).getEntity()), selectedIndex); + RealmTO reamTO = RealmTO.class.cast(ProvisioningResult.class.cast(result).getEntity()); + // reload realmChoicePanel label too - SYNCOPE-1151 + target.add(realmChoicePanel.reloadRealmTree(target, Model.of(reamTO))); + updateRealmContent(reamTO, selectedIndex); + target.add(content); + } else { + target.add(realmChoicePanel.reloadRealmTree(target)); } - modal.show(false); } }); http://git-wip-us.apache.org/repos/asf/syncope/blob/38ff9d11/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java index a141a72..aea311f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java @@ -70,7 +70,7 @@ public class RealmChoicePanel extends Panel { private final WebMarkupContainer container; - private final Model<RealmTO> model; + private Model<RealmTO> model; private final Collection<String> availableRealms; @@ -314,6 +314,12 @@ public class RealmChoicePanel extends Panel { return this; } + public final RealmChoicePanel reloadRealmTree(final AjaxRequestTarget target, final Model<RealmTO> newModel) { + model = newModel; + reloadRealmTree(target); + return this; + } + private Map<String, Pair<RealmTO, List<RealmTO>>> reloadRealmParentMap() { final List<RealmTO> realms = realmRestClient.list(); Collections.sort(realms, new RealmNameComparator());
