Author: thomas.heute(a)jboss.com Date: 2007-03-19 10:54:27 -0400 (Mon, 19 Mar 2007) New Revision: 6746 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 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: - Add submit and cancel buttons on instances security - Make cancel buttons work on security pages - Let the admin modify the Personalize security flag on instances 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-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-19 14:54:27 UTC (rev 6746) @@ -24,31 +24,29 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Comparator; -import java.util.Collections; import java.util.Set; +import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; -import javax.faces.application.FacesMessage; -import org.jboss.logging.Logger; +import org.jboss.portal.common.value.Value; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.instance.NoSuchInstanceException; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PreferencesInfo; import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.info.PreferencesInfo; import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.security.AuthorizationDomainRegistry; +import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.common.value.Value; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -58,9 +56,6 @@ public class InstanceManagerBean { - /** . */ - private Logger log = Logger.getLogger(getClass()); - // Wired services /** . */ @@ -410,7 +405,8 @@ public SelectItem[] getAvailableActions() { return new SelectItem[]{ - new SelectItem("view") + new SelectItem("view", "View"), + new SelectItem("personalize", "Personalize"), }; } } 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-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-19 14:54:27 UTC (rev 6746) @@ -11,7 +11,7 @@ <ui:define name="form_submit"> <h:form> <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" 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> </h:form> 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-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-19 14:54:27 UTC (rev 6746) @@ -12,7 +12,7 @@ <ui:define name="form_submit"> <h:form> <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" 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> </h:form> 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-03-19 13:16:17 UTC (rev 6745) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-03-19 14:54:27 UTC (rev 6746) @@ -101,9 +101,16 @@ <c:if test="#{instancemgr.selectedPlugin == 'security'}"> <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3> - <ui:include src="common/editSecurity.xhtml"> - <ui:param name="auth" value="#{instancemgr.auth}"/> - </ui:include> + + <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{instancemgr.auth}"/> + <ui:define name="form_submit"> + <h:form> + <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="instances" styleClass="portlet-form-button" immediate="true"/> + </h:form> + </ui:define> + </ui:decorate> </c:if> </c:if>