Author: julien(a)jboss.com Date: 2007-04-23 18:18:57 -0400 (Mon, 23 Apr 2007) New Revision: 7033 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AbstractAuthorizationBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml Log: security update/cancel was not working properly : fixes that Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AbstractAuthorizationBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AbstractAuthorizationBean.java 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AbstractAuthorizationBean.java 2007-04-23 22:18:57 UTC (rev 7033) @@ -196,8 +196,10 @@ } } - public abstract String execute(); + public abstract String submit(); + public abstract String cancel(); + public abstract RoleModule getRoleModule(); public abstract DomainConfigurator getDomainConfigurator(); Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-04-23 22:18:57 UTC (rev 7033) @@ -387,7 +387,7 @@ } } - public String execute() + public String submit() { String stringMessage = "Security has been correctly updated"; FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); @@ -397,6 +397,13 @@ return null; } + public String cancel() + { + selectedId = null; + selectedPlugin = null; + return null; + } + public RoleModule getRoleModule() { return roleModule; @@ -404,10 +411,7 @@ public SelectItem[] getAvailableActions() { - return new SelectItem[]{ - new SelectItem("view", "View"), - new SelectItem("personalize", "Personalize"), - }; + return new SelectItem[]{ new SelectItem("view", "View") }; } } } Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-04-23 22:18:57 UTC (rev 7033) @@ -44,9 +44,7 @@ import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.theme.LayoutService; -import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeService; -import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; @@ -590,7 +588,7 @@ }; } - public String execute() + public String submit() { String stringMessage = "Security has been correctly updated on the page"; FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage); @@ -604,6 +602,11 @@ return "objects"; } + public String cancel() + { + return "objects"; + } + public RoleModule getRoleModule() { return roleModule; Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-04-23 22:18:57 UTC (rev 7033) @@ -99,9 +99,6 @@ // Runtime state /** . */ - private AbstractAuthorizationBean auth = new AuthorizationBean(); - - /** . */ private PreferencesBean selectedPreferences; /** . */ @@ -299,11 +296,6 @@ return authorizationDomainRegistry.getDomain("portlet").getConfigurator(); } - public AbstractAuthorizationBean getAuth() - { - return auth; - } - public Portlet getSelectedPortlet() { if (selectedPortlet == null && selectedPortletId != null) @@ -392,43 +384,4 @@ return p1.getContext().getId().compareToIgnoreCase(p2.getContext().getId()); } }; - - public class AuthorizationBean extends AbstractAuthorizationBean - { - - protected String getURI() - { - Portlet portlet = getSelectedPortlet(); - if (portlet != null) - { - return portlet.getContext().getId(); - } - else - { - return null; - } - } - - public String execute() - { - return null; - } - - public RoleModule getRoleModule() - { - return roleModule; - } - - public DomainConfigurator getDomainConfigurator() - { - return PortletManagerBean.this.getDomainConfigurator(); - } - - public SelectItem[] getAvailableActions() - { - return new SelectItem[]{ - new SelectItem("view") - }; - } - } } Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-04-23 22:18:57 UTC (rev 7033) @@ -29,7 +29,8 @@ </tbody> </table> <div style="text-align:center;padding: 1em 0 1em 0"> - <ui:insert name="form_submit"/> + <h:commandLink id="update" value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/> + <h:commandLink id="cancel" value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> </div> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-04-23 22:18:57 UTC (rev 7033) @@ -8,12 +8,6 @@ <h3>Please set the page permissions</h3> <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true"> - <f:param name="id" value="#{node.id}"/> - </h:commandButton> - </ui:define> </ui:decorate> </ui:define> </ui:composition> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-04-23 22:18:57 UTC (rev 7033) @@ -2,19 +2,12 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:f="http://java.sun.com/jsf/core"> <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:define name="content"> <h3>Please set the portal permissions</h3> <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true"> - <f:param name="id" value="#{node.id}"/> - </h:commandButton> - </ui:define> </ui:decorate> </ui:define> </ui:composition> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-04-23 20:21:56 UTC (rev 7032) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-04-23 22:18:57 UTC (rev 7033) @@ -104,10 +104,6 @@ <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{instancemgr.auth}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="instances" styleClass="portlet-form-button" immediate="true"/> - </ui:define> </ui:decorate> </c:if>