Author: andreapatricelli Date: Fri Jun 20 14:37:27 2014 New Revision: 1604178
URL: http://svn.apache.org/r1604178 Log: [SYNCOPE-512] merge with branch Modified: syncope/trunk/ (props changed) syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java Propchange: syncope/trunk/ ------------------------------------------------------------------------------ Merged /syncope/branches/1_1_X:r1603821-1604175 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=1604178&r1=1604177&r2=1604178&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 Fri Jun 20 14:37:27 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); + } } }; }
