Author: tan_pham_dinh Date: 2010-01-17 23:18:28 -0500 (Sun, 17 Jan 2010) New Revision: 1342 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml Log: GTNPORTAL-316: Should show a message when select type of apps, which has no apps, in UIAddApplicationForm 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-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2010-01-18 04:18:28 UTC (rev 1342) @@ -37,8 +37,8 @@ import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.core.model.SelectItemOption; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; -import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormInputInfo; import org.exoplatform.webui.form.UIFormInputSet; @@ -196,7 +196,7 @@ String portletName = info.getName(); Application app = new Application(); app.setApplicationName(portletName); -// app.setApplicationGroup(info.getApplicationName()); + // app.setApplicationGroup(info.getApplicationName()); ApplicationType appType; String contentId; if (remote) @@ -207,7 +207,7 @@ else { appType = ApplicationType.PORTLET; - contentId = info.getApplicationName() + "/" + info.getName(); + contentId = info.getApplicationName() + "/" + info.getName(); } app.setType(appType); app.setDisplayName(Util.getLocalizedStringValue(displayNameLS, portletName)); @@ -228,6 +228,14 @@ UIAddApplicationForm uiForm = event.getSource(); String type = uiForm.getUIFormSelectBox(UIAddApplicationForm.FIELD_TYPE).getValue(); uiForm.setApplicationList(type); + uiForm.getChild(UIFormTableIteratorInputSet.class).setRendered(true); + if (uiForm.getApplications().size() == 0) + { + UIApplication uiApp = event.getRequestContext().getUIApplication(); + uiApp.addMessage(new ApplicationMessage("UIAddApplicationForm.msg.typeNoApps", null)); + event.getRequestContext().addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages()); + uiForm.getChild(UIFormTableIteratorInputSet.class).setRendered(false); + } event.getRequestContext().addUIComponentToUpdateByAjax(uiForm); } @@ -282,7 +290,7 @@ uiOrganizer.setSelectedCategory(selectedCate.getName()); uiOrganizer.selectApplication(app.getApplicationName()); ctx.addUIComponentToUpdateByAjax(uiOrganizer); - } + } private Application cloneApplication(Application app) { Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2010-01-18 04:18:28 UTC (rev 1342) @@ -145,6 +145,7 @@ <msg> <PortletExist>!إن هذه الخدمة في الفئة ، يرجى اختيار واحدة أخرى</PortletExist> <appNotExists>Please select an application.</appNotExists> + <typeNoApps>There is no applications of this type.</typeNoApps> </msg> <label> <displayName>#{label.displayName}</displayName> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-01-18 04:18:28 UTC (rev 1342) @@ -76,6 +76,7 @@ UIAddApplicationForm.action.Add=Add UIAddApplicationForm.msg.PortletExist=This Application is already in category, please select another one! UIAddApplicationForm.msg.appNotExists=Please select an application. +UIAddApplicationForm.msg.typeNoApps=There is no applications of this type. UIAddApplicationForm.action.Cancel=#{word.cancel} UIAddApplicationForm.label.displayName=#{label.displayName} UIAddApplicationForm.label.type=Application Type Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties 2010-01-18 04:18:28 UTC (rev 1342) @@ -76,6 +76,7 @@ UIAddApplicationForm.action.Add=A\u00f1adir UIAddApplicationForm.msg.PortletExist=Esta aplicaci\u00f3n ya existe en la categor\u00eda, por favor seleccione otra aplicaci\u00f3n! UIAddApplicationForm.msg.appNotExists=Por favor, selecciona una aplicaci\u00f3n. +UIAddApplicationForm.msg.typeNoApps=There is no applications of this type. UIAddApplicationForm.action.Cancel=#{word.cancel} UIAddApplicationForm.label.displayName=#{label.displayName} UIAddApplicationForm.label.type=Tipo de Aplicaci\u00f3n Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties 2010-01-18 04:18:28 UTC (rev 1342) @@ -76,6 +76,7 @@ UIAddApplicationForm.action.Add=Aggiungi UIAddApplicationForm.msg.PortletExist=L'applicazione \u00E8 gi\u00E0 presente nella categoria, selezionane un'altra! UIAddApplicationForm.msg.appNotExists=Seleziona l'applicazione. +UIAddApplicationForm.msg.typeNoApps=There is no applications of this type. UIAddApplicationForm.action.Cancel=#{word.cancel} UIAddApplicationForm.label.displayName=#{label.displayName} UIAddApplicationForm.label.type=Tipo di Applicazione Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml 2010-01-18 04:18:28 UTC (rev 1342) @@ -145,6 +145,7 @@ <msg> <PortletExist>카테고리에 이 애플리케이션이 이미 존재합니다. 다른 애플리케이션을 선택해 주십시오.</PortletExist> <appNotExists>애플리케이션을 선택해 주십시오.</appNotExists> + <typeNoApps>There is no applications of this type.</typeNoApps> </msg> <label> <displayName>#{label.displayName}</displayName> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2010-01-18 04:18:28 UTC (rev 1342) @@ -77,6 +77,7 @@ UIAddApplicationForm.action.Add=Добавить UIAddApplicationForm.msg.PortletExist=Это приложение уже в указанной категории. Выберите другую категори. UIAddApplicationForm.msg.appNotExists=Please select an application. +UIAddApplicationForm.msg.typeNoApps=There is no applications of this type. UIAddApplicationForm.action.Cancel=#{word.cancel} UIAddApplicationForm.label.displayName=#{label.displayName} UIAddApplicationForm.label.type=Тип приложения Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties 2010-01-18 04:18:28 UTC (rev 1342) @@ -77,6 +77,7 @@ UIAddApplicationForm.action.Add=Додати UIAddApplicationForm.msg.PortletExist=Це застосування вже є в категорії, будь ласка, оберіть інше! UIAddApplicationForm.msg.appNotExists=Please select an application. +UIAddApplicationForm.msg.typeNoApps=There is no applications of this type. UIAddApplicationForm.action.Cancel=#{word.cancel} UIAddApplicationForm.label.displayName=#{label.displayName} UIAddApplicationForm.label.type=Тип застосування Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-01-18 02:13:08 UTC (rev 1341) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-01-18 04:18:28 UTC (rev 1342) @@ -145,6 +145,7 @@ <msg> <PortletExist>Ứng dụng này đã tồn tại trong danh mục này, hãy chọn một ứng dụng khác!</PortletExist> <appNotExists>Vui lòng chọn một ứng dụng.</appNotExists> + <typeNoApps>Không tồn tại ứng dụng theo kiểu ứng dụng đã chọn.</typeNoApps> </msg> <label> <displayName>#{label.displayName}</displayName>