You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2014/06/20 16:15:07 UTC
svn commit: r1604174 -
/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
Author: andreapatricelli
Date: Fri Jun 20 14:15:06 2014
New Revision: 1604174
URL: http://svn.apache.org/r1604174
Log:
disabled assignment, in edit user modal page, of a membership between root (fake) role and user (possible if no other role exists)
Modified:
syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java?rev=1604174&r1=1604173&r2=1604174&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java (original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java Fri Jun 20 14:15:06 2014
@@ -116,27 +116,29 @@ public class MembershipsPanel extends Pa
@Override
protected void onClick(final AjaxRequestTarget target) {
- membWin.setPageCreator(new ModalWindow.PageCreator() {
+ if (roleTO.getId() > 0) {
+ membWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID = 7661763358801821185L;
+ private static final long serialVersionUID = 7661763358801821185L;
- @Override
- public Page createPage() {
- PageReference pageRef = getPage().getPageReference();
-
- for (MembershipTO membTO : membView.getList()) {
- if (membTO.getRoleId() == roleTO.getId()) {
- return new MembershipModalPage(pageRef, membWin, membTO, templateMode);
+ @Override
+ public Page createPage() {
+ PageReference pageRef = getPage().getPageReference();
+
+ for (MembershipTO membTO : membView.getList()) {
+ if (membTO.getRoleId() == roleTO.getId()) {
+ return new MembershipModalPage(pageRef, membWin, membTO, templateMode);
+ }
}
- }
- MembershipTO membTO = new MembershipTO();
- membTO.setRoleId(roleTO.getId());
- membTO.setRoleName(roleTO.getName());
+ MembershipTO membTO = new MembershipTO();
+ membTO.setRoleId(roleTO.getId());
+ membTO.setRoleName(roleTO.getName());
- return new MembershipModalPage(pageRef, membWin, membTO, templateMode);
- }
- });
- membWin.show(target);
+ return new MembershipModalPage(pageRef, membWin, membTO, templateMode);
+ }
+ });
+ membWin.show(target);
+ }
}
};
}