You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/07/14 11:05:57 UTC
[1/2] syncope git commit: [SYNCOPE-1151] Realm is correctly loaded
after creation
Repository: syncope
Updated Branches:
refs/heads/2_0_X 8f9c388aa -> 5b852628a
refs/heads/master 020a35c64 -> 8d2d9edc5
[SYNCOPE-1151] Realm is correctly loaded after creation
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5b852628
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5b852628
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5b852628
Branch: refs/heads/2_0_X
Commit: 5b852628ad56b20e844ee3aa7e93960b832b9fb7
Parents: 8f9c388
Author: Matteo Alessandroni <ma...@tirasa.net>
Authored: Fri Jul 14 12:12:46 2017 +0200
Committer: Matteo Alessandroni <ma...@tirasa.net>
Committed: Fri Jul 14 12:12:46 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/client/console/pages/Realms.java | 10 +++++-----
.../syncope/client/console/panels/RealmChoicePanel.java | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5b852628/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 b801cf3..b87ab2c 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
@@ -196,15 +196,15 @@ public class Realms extends BasePage {
if (modal.getContent() instanceof ResultPage) {
Serializable result = ResultPage.class.cast(modal.getContent()).getResult();
- RealmTO reamTO = RealmTO.class.cast(ProvisioningResult.class.cast(result).getEntity());
+ RealmTO newRealmTO = 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);
+ target.add(realmChoicePanel.reloadRealmTree(target, Model.of(newRealmTO)));
+ realmChoicePanel.setCurrentRealm(newRealmTO);
+ send(Realms.this, Broadcast.DEPTH, new ChosenRealm<>(newRealmTO, target));
} else {
target.add(realmChoicePanel.reloadRealmTree(target));
}
+ target.add(content);
modal.show(false);
}
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/5b852628/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 aea311f..3e846db 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
@@ -380,6 +380,10 @@ public class RealmChoicePanel extends Panel {
return model.getObject();
}
+ public void setCurrentRealm(final RealmTO realmTO) {
+ model.setObject(realmTO);
+ }
+
public RealmTO moveToParentRealm(final String key) {
for (Pair<RealmTO, List<RealmTO>> subtree : tree.values()) {
for (RealmTO child : subtree.getRight()) {
[2/2] syncope git commit: [SYNCOPE-1151] Realm is correctly loaded
after creation - This closes #56
Posted by il...@apache.org.
[SYNCOPE-1151] Realm is correctly loaded after creation - This closes #56
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8d2d9edc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8d2d9edc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8d2d9edc
Branch: refs/heads/master
Commit: 8d2d9edc5af8b1017731c1c711f9e3b934f2896f
Parents: 020a35c
Author: Matteo Alessandroni <ma...@tirasa.net>
Authored: Fri Jul 14 12:12:46 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 14 13:05:35 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/client/console/pages/Realms.java | 10 +++++-----
.../syncope/client/console/panels/RealmChoicePanel.java | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8d2d9edc/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 b801cf3..b87ab2c 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
@@ -196,15 +196,15 @@ public class Realms extends BasePage {
if (modal.getContent() instanceof ResultPage) {
Serializable result = ResultPage.class.cast(modal.getContent()).getResult();
- RealmTO reamTO = RealmTO.class.cast(ProvisioningResult.class.cast(result).getEntity());
+ RealmTO newRealmTO = 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);
+ target.add(realmChoicePanel.reloadRealmTree(target, Model.of(newRealmTO)));
+ realmChoicePanel.setCurrentRealm(newRealmTO);
+ send(Realms.this, Broadcast.DEPTH, new ChosenRealm<>(newRealmTO, target));
} else {
target.add(realmChoicePanel.reloadRealmTree(target));
}
+ target.add(content);
modal.show(false);
}
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/8d2d9edc/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 51f766a..79c3322 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
@@ -380,6 +380,10 @@ public class RealmChoicePanel extends Panel {
return model.getObject();
}
+ public void setCurrentRealm(final RealmTO realmTO) {
+ model.setObject(realmTO);
+ }
+
public RealmTO moveToParentRealm(final String key) {
for (Pair<RealmTO, List<RealmTO>> subtree : tree.values()) {
for (RealmTO child : subtree.getRight()) {