You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2014/05/27 14:52:04 UTC
svn commit: r1597768 - in
/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages:
MembershipModalPage.java panels/MembershipsPanel.java
Author: mdisabatino
Date: Tue May 27 12:52:03 2014
New Revision: 1597768
URL: http://svn.apache.org/r1597768
Log:
[SYNCOPE-495] Fix MembershipsPanel behavior
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1597768&r1=1597767&r2=1597768&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java Tue May 27 12:52:03 2014
@@ -76,6 +76,7 @@ public class MembershipModalPage extends
@Override
protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ ((UserModalPage) pageRef.getPage()).setUserTO(userTO);
window.close(target);
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java?rev=1597768&r1=1597767&r2=1597768&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java Tue May 27 12:52:03 2014
@@ -78,7 +78,7 @@ public class MembershipsPanel extends Pa
super(id);
this.userTO = userTO;
this.statusPanel = statusPanel;
-
+
final WebMarkupContainer membershipsContainer = new WebMarkupContainer("membershipsContainer");
membershipsContainer.setOutputMarkupId(true);
add(membershipsContainer);
@@ -189,6 +189,7 @@ public class MembershipsPanel extends Pa
@Override
protected void onClickInternal(final AjaxRequestTarget target) {
userTO.getMemberships().remove(membershipTO);
+ ((UserModalPage) getPage()).getUserTO().getMemberships().remove(membershipTO);
target.add(membershipsContainer);
RoleTO roleTO = RoleUtils.findRole(roleTreeBuilder, membershipTO.getRoleId());
@@ -243,7 +244,7 @@ public class MembershipsPanel extends Pa
}
MembershipsPanel.this.userTO.getMemberships().clear();
- MembershipsPanel.this.userTO.getMemberships().addAll(updatedUserTO.getMemberships());
+ MembershipsPanel.this.userTO.getMemberships().addAll(updatedUserTO.getMemberships());
target.add(container);
}
});