[gatein-commits] gatein SVN: r3201 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 1 other directory.

Author: ndkhoiits Date: 2010-05-26 05:21:59 -0400 (Wed, 26 May 2010) New Revision: 3201 Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPermissionForm.java Log: GTNPORTAL-1239 Set the portlets and gadgets to be public bydefault in some cases: - Import Applications - Add a portlet into category - Add a gadget into categories Reload Categories and application infos after change access permissions Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-05-26 05:48:41 UTC (rev 3200) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-05-26 09:21:59 UTC (rev 3201) @@ -454,6 +454,8 @@ } } + ArrayList<String> permissions = new ArrayList<String>(); + permissions.add(UserACL.EVERYONE); // If no keywords, use the portlet application name if (categoryNames.isEmpty()) { @@ -487,6 +489,7 @@ { category = registry.createCategory(categoryName); category.setDisplayName(categoryName); + category.setAccessPermissions(permissions); } // @@ -515,6 +518,7 @@ app = category.createContent(portletName, contentType, contentId); app.setDisplayName(displayName); app.setDescription(getLocalizedStringValue(descriptionLS, portletName)); + app.setAccessPermissions(permissions); } } } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2010-05-26 05:48:41 UTC (rev 3200) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2010-05-26 09:21:59 UTC (rev 3201) @@ -285,6 +285,8 @@ } Application app = cloneApplication(tmp); + UIApplicationRegistryPortlet.setPermissionToEveryone(app); + if (displayName != null && displayName.trim().length() > 0) { app.setDisplayName(displayName); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java 2010-05-26 05:48:41 UTC (rev 3200) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationRegistryPortlet.java 2010-05-26 09:21:59 UTC (rev 3201) @@ -19,10 +19,14 @@ package org.exoplatform.applicationregistry.webui.component; +import java.util.ArrayList; + +import org.exoplatform.application.registry.Application; +import org.exoplatform.commons.serialization.api.annotations.Serialized; +import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.ViewChildActionListener; import org.exoplatform.webui.application.WebuiApplication; import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIPortletApplication; @@ -47,4 +51,12 @@ // TODO Auto-generated method stub super.processRender(app, context); } + + public static void setPermissionToEveryone(Application app) + { + ArrayList<String> defaultPermission = new ArrayList<String>(); + defaultPermission.add(UserACL.EVERYONE); + + app.setAccessPermissions(defaultPermission); + } } \ No newline at end of file Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2010-05-26 05:48:41 UTC (rev 3200) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2010-05-26 09:21:59 UTC (rev 3201) @@ -132,7 +132,9 @@ chkInput = selector.getUIInput("category_" + category.getName()); if (chkInput != null && chkInput.isChecked()) { - appRegService.save(category, cloneApplication(selector.getApplication())); + Application newApp = cloneApplication(selector.getApplication()); + UIApplicationRegistryPortlet.setPermissionToEveryone(newApp); + appRegService.save(category, newApp); } } UIGadgetInfo gadgetInfo = selector.getParent(); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPermissionForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPermissionForm.java 2010-05-26 05:48:41 UTC (rev 3200) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPermissionForm.java 2010-05-26 09:21:59 UTC (rev 3201) @@ -93,9 +93,10 @@ return; } service.update(application_); - + Application selectedApplication = getApplication(); UIApplicationOrganizer uiApplicationOrganizer = getAncestorOfType(UIApplicationOrganizer.class); uiApplicationOrganizer.reload(); + uiApplicationOrganizer.setSelectedApplication(selectedApplication); } static public class SelectMembershipActionListener extends EventListener<UIPermissionForm>