gatein SVN: r519 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-08 23:21:23 -0500 (Sun, 08 Nov 2009)
New Revision: 519
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_en.properties
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
Log:
GTNPORTAL-150: Rename "Organize" to "Categories", move "Portlet" and "Gadget" to the right.
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 2009-11-09 02:52:52 UTC (rev 518)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2009-11-09 04:21:23 UTC (rev 519)
@@ -59,7 +59,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.ResourceBundle;
import java.util.Set;
/**
@@ -87,10 +86,6 @@
public UIAddApplicationForm() throws Exception
{
-
- WebuiRequestContext contextres = WebuiRequestContext.getCurrentInstance();
- ResourceBundle res = contextres.getApplicationResourceBundle();
-
addUIFormInput(new UIFormStringInput(FIELD_NAME, null, null).addValidator(StringLengthValidator.class, 3, 30));
List<SelectItemOption<String>> types = new ArrayList<SelectItemOption<String>>(2);
types.add(new SelectItemOption<String>(org.exoplatform.web.application.Application.EXO_PORTLET_TYPE));
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 2009-11-09 02:52:52 UTC (rev 518)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2009-11-09 04:21:23 UTC (rev 519)
@@ -66,7 +66,7 @@
## org.exoplatform.applicationregistry.webui.component.UIAddApplicationForm
UIAddApplicationForm.header.input=Choose
-UIAddApplicationForm.label.option.portlet=Application
+UIAddApplicationForm.label.option.portlet=Portlet
UIAddApplicationForm.label.option.eXoGadget=Gadget
UIAddApplicationForm.header.label=Display Name
UIAddApplicationForm.header.description=Description
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 2009-11-09 02:52:52 UTC (rev 518)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2009-11-09 04:21:23 UTC (rev 519)
@@ -66,7 +66,7 @@
## org.exoplatform.applicationregistry.webui.component.UIAddApplicationForm
UIAddApplicationForm.header.input=Выбрать
-UIAddApplicationForm.label.option.portlet=Приложение
+UIAddApplicationForm.label.option.portlet=Портлет
UIAddApplicationForm.label.option.eXoGadget=Гаджет
UIAddApplicationForm.header.label=Отображаемое имя
UIAddApplicationForm.header.description=Описание
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 2009-11-09 02:52:52 UTC (rev 518)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties 2009-11-09 04:21:23 UTC (rev 519)
@@ -66,7 +66,7 @@
## org.exoplatform.applicationregistry.webui.component.UIAddApplicationForm
UIAddApplicationForm.header.input=Вибрати
-UIAddApplicationForm.label.option.portlet=Застосування
+UIAddApplicationForm.label.option.portlet=Портлет
UIAddApplicationForm.label.option.eXoGadget=Віджет
UIAddApplicationForm.header.label=Відображення імені
UIAddApplicationForm.header.description=Опис
15 years, 1 month
gatein SVN: r518 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-08 21:52:52 -0500 (Sun, 08 Nov 2009)
New Revision: 518
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
Log:
GTNPORTAL-85: Error in displaying in IE
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2009-11-06 15:52:48 UTC (rev 517)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2009-11-09 02:52:52 UTC (rev 518)
@@ -105,8 +105,8 @@
var items = DOMUtil.findDescendantsByClass(cont, "div", this.tabStyleClass);
if(items.length == 0) cont.parentNode.removeChild(cont);
for(var j = 0; j < items.length; j ++) {
- items[i].onmouseover = eXo.portal.UIPortalNavigation.onMenuItemOver;
- items[i].onmouseout = eXo.portal.UIPortalNavigation.onMenuItemOut;
+ items[j].onmouseover = eXo.portal.UIPortalNavigation.onMenuItemOver;
+ items[j].onmouseout = eXo.portal.UIPortalNavigation.onMenuItemOut;
}
}
};
15 years, 1 month
gatein SVN: r517 - components/pc/trunk/test/src/test.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-06 10:52:48 -0500 (Fri, 06 Nov 2009)
New Revision: 517
Modified:
components/pc/trunk/test/src/test/build.xml
Log:
Set the timeout in the correct place (Tests would fail on a slow machine)
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-11-06 10:53:20 UTC (rev 516)
+++ components/pc/trunk/test/src/test/build.xml 2009-11-06 15:52:48 UTC (rev 517)
@@ -727,7 +727,8 @@
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
- wait="${cargo.wait}">
+ wait="${cargo.wait}"
+ timeout="240000">
<!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
<sharedClasspath>
@@ -735,7 +736,6 @@
</sharedClasspath>
<configuration home="${test.jboss-5.1.tempdir}">
- <property name="cargo.timeout" value="240000"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
15 years, 1 month
gatein SVN: r516 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-06 05:53:20 -0500 (Fri, 06 Nov 2009)
New Revision: 516
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
Log:
GTNPORTAL-85: Error in displaying ToolbarPortlet in IE
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2009-11-06 10:25:26 UTC (rev 515)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2009-11-06 10:53:20 UTC (rev 516)
@@ -96,18 +96,19 @@
}
}
- // Sub menus items
- var menuItems = DOMUtil.findDescendantsByClass(topContainer, "div", this.tabStyleClass);
- for(var i = 0; i < menuItems.length; i++) {
- var menuItem = menuItems[i];
- menuItem.onmouseover = eXo.portal.UIPortalNavigation.onMenuItemOver;
- menuItem.onmouseout = eXo.portal.UIPortalNavigation.onMenuItemOut;
-
- // Set an id to each container for future reference
- var cont = DOMUtil.findAncestorByClass(menuItem, this.containerStyleClass) ;
- if (!cont.id) cont.id = DOMUtil.generateId("PortalNavigationContainer");
- cont.resized = false;
- }
+ var itemConts = DOMUtil.findDescendantsByClass(topContainer, "div", this.containerStyleClass);
+ for (var i = 0; i < itemConts.length; i++) {
+ var cont = itemConts[i];
+ if(!cont.id) cont.id = DOMUtil.generateId("PortalNavigationContainer");
+ cont.resized = false;
+
+ var items = DOMUtil.findDescendantsByClass(cont, "div", this.tabStyleClass);
+ if(items.length == 0) cont.parentNode.removeChild(cont);
+ for(var j = 0; j < items.length; j ++) {
+ items[i].onmouseover = eXo.portal.UIPortalNavigation.onMenuItemOver;
+ items[i].onmouseout = eXo.portal.UIPortalNavigation.onMenuItemOut;
+ }
+ }
};
/**
* Sets the tab style on mouse over and mouse out
15 years, 1 month
gatein SVN: r515 - in portal/trunk/web/portal/src/main/webapp: login/jsp and 1 other directory.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-11-06 05:25:26 -0500 (Fri, 06 Nov 2009)
New Revision: 515
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
Log:
GTNPORTAL-9 Login page isn't fully internationalized
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-06 09:31:19 UTC (rev 514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-06 10:25:26 UTC (rev 515)
@@ -248,6 +248,8 @@
UILoginForm.label.Signup=Signup
UILoginForm.label.Signin=Sign in
UILoginForm.label.ForAccount=Register now for an account
+UILoginForm.label.SigninFail=Sign in failed. Wrong username or password.
+UILoginForm.label.Copyright=Copyright © 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc.
#############################################################################
# Message Error #
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-06 09:31:19 UTC (rev 514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2009-11-06 10:25:26 UTC (rev 515)
@@ -234,6 +234,8 @@
UILoginForm.label.Signin=Connexion
UILoginForm.label.Signup=Enregistrement
UILoginForm.label.ForAccount=Créer un compte
+UILoginForm.label.SigninFail=Sign in failed. Wrong username or password.
+UILoginForm.label.Copyright=Copyright © 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc.
#############################################################################
# Message Error #
@@ -1333,4 +1335,4 @@
UIAddGroupNavigation.Action.Add=Add Navigation
UIAddGroupNavigation.Label.NoPermission=This user doesn't have permisson to add navigation
-UIAddGroupNavigation.header.Group=Group
\ No newline at end of file
+UIAddGroupNavigation.header.Group=Group
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-06 09:31:19 UTC (rev 514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2009-11-06 10:25:26 UTC (rev 515)
@@ -229,6 +229,8 @@
UILoginForm.label.Signup=Регистрация
UILoginForm.label.Signin=Вход
UILoginForm.label.ForAccount=Зарегистрировать учётную запись
+UILoginForm.label.SigninFail=Sign in failed. Wrong username or password.
+UILoginForm.label.Copyright=Copyright © 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc.
#############################################################################
# Message Error #
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-06 09:31:19 UTC (rev 514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2009-11-06 10:25:26 UTC (rev 515)
@@ -229,6 +229,8 @@
UILoginForm.label.Signup=Підписатися
UILoginForm.label.Signin=Вхід
UILoginForm.label.ForAccount=Зареєструвати новий обліковий запис
+UILoginForm.label.SigninFail=Sign in failed. Wrong username or password.
+UILoginForm.label.Copyright=Copyright © 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc.
#############################################################################
# Message Error #
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-06 09:31:19 UTC (rev 514)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2009-11-06 10:25:26 UTC (rev 515)
@@ -229,6 +229,8 @@
UILoginForm.label.Signup=Đăng nhập
UILoginForm.label.Signin=Đăng nhập
UILoginForm.label.ForAccount=Đăng kí tài khoản
+UILoginForm.label.SigninFail=Sign in failed. Wrong username or password.
+UILoginForm.label.Copyright=Copyright © 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc.
#############################################################################
# Message Error #
Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2009-11-06 09:31:19 UTC (rev 514)
+++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2009-11-06 10:25:26 UTC (rev 515)
@@ -65,7 +65,7 @@
<%
if(username.length() > 0 || password.length() > 0) {
%>
- <font color="red">Sign in failed. Wrong username or password.</font><%}%>
+ <font color="red"><%=res.getString("UILoginForm.label.SigninFail")%></font><%}%>
<form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;">
<input type="hidden" name="uri" value="<%=session.getAttribute("initialURI") %>"/>
<table>
@@ -106,6 +106,6 @@
</div>
</div>
</div>
- <span style="font-size: 11px; color: #3f3f3f; text-align: center">Copyright © 2009. All rights Reserved, eXo Platform SAS and Red Hat, Inc.</span>
+ <span style="font-size: 11px; color: #3f3f3f; text-align: center"><%=res.getString("UILoginForm.label.Copyright")%></span>
</body>
</html>
\ No newline at end of file
15 years, 1 month
gatein SVN: r514 - portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-11-06 04:31:19 -0500 (Fri, 06 Nov 2009)
New Revision: 514
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIPortletInfo.gtmpl
Log:
GTNPORTAL-108 Should remove UIPortletInfor when portlet haven't information about portlet Preferences in Application registry
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIPortletInfo.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIPortletInfo.gtmpl 2009-11-06 09:03:25 UTC (rev 513)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIPortletInfo.gtmpl 2009-11-06 09:31:19 UTC (rev 514)
@@ -63,16 +63,15 @@
</div>
</div>
+ <% if(portletPreferences.getKeys().size() != 0) {%>
<div class="Preferences" style="border: 1px solid #b7b7b7; padding: 10px; margin: 10px; background: #f7f7f7">
<table class="UIGrid" style="width: 99%">
<tr>
<th colspan="2"><%=_ctx.appRes("UIPortletInfo.title.portletPreferences")%></th>
</tr>
- <% if(portletPreferences == null) {%>
- <tr>
- <td colspan="2" style="text-align: center; font-weight: bold;"><%=_ctx.appRes("UIPortletInfo.msg.noPortletPreferences")%></td>
- </tr>
- <% } else {
+
+
+ <%
//Iterator<Entry<String, String[]>> itr = portletPreferences.getKeys().iterator();
Iterator<String> itr = portletPreferences.getKeys().iterator();
while(itr.hasNext()) {
@@ -89,7 +88,8 @@
<% } %>
</td>
</tr>
- <% } }%>
+ <% }%>
</table>
</div>
+ <% }%>
</div>
\ No newline at end of file
15 years, 1 month
gatein SVN: r513 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2009-11-06 04:03:25 -0500 (Fri, 06 Nov 2009)
New Revision: 513
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
Log:
GTNPORTAL-136: Can't register new user in public mode in special case
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2009-11-06 08:59:08 UTC (rev 512)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2009-11-06 09:03:25 UTC (rev 513)
@@ -44,5 +44,12 @@
<visible>false</visible>
<page-reference>portal::@owner@::portalnavigation</page-reference>
</node>
+ <node>
+ <uri>register</uri>
+ <name>register</name>
+ <label>Register</label>
+ <visible>false</visible>
+ <page-reference>portal::@owner@::register</page-reference>
+ </node>
</page-nodes>
</node-navigation>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2009-11-06 08:59:08 UTC (rev 512)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2009-11-06 09:03:25 UTC (rev 513)
@@ -72,4 +72,20 @@
</portlet-application>
</page>
+ <page>
+ <name>register</name>
+ <title>Register</title>
+ <access-permissions>*:/platform/guests</access-permissions>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <portlet-application>
+ <portlet>
+ <application-ref>exoadmin</application-ref>
+ <portlet-ref>AccountPortlet</portlet-ref>
+ </portlet>
+ <title>New Account</title>
+ <access-permissions>*:/platform/guests</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+ </page>
+
</page-set>
15 years, 1 month
gatein SVN: r512 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component and 2 other directories.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2009-11-06 03:59:08 -0500 (Fri, 06 Nov 2009)
New Revision: 512
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
GTNPORTAL-203: A membership type should be configurable as a mandatory resource in portal
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2009-11-06 08:59:08 UTC (rev 512)
@@ -61,6 +61,8 @@
private String navigationCreatorMembershipType_;
private List<String> mandatoryGroups_;
+
+ private List<String> mandatoryMSTypes_;
private PortalACLPlugin portalACLPlugin;
@@ -89,6 +91,12 @@
mandatoryGroups_ = mandatoryGroupsParam.getValues();
else
mandatoryGroups_ = new ArrayList<String>();
+
+ ValuesParam mandatoryMSTypesParam = params.getValuesParam("mandatory.mstypes");
+ if (mandatoryMSTypesParam != null)
+ mandatoryMSTypes_ = mandatoryMSTypesParam.getValues();
+ else
+ mandatoryMSTypes_ = new ArrayList<String>();
// tam.nguyen get admin group value
ValueParam adminGroupsParam = params.getValueParam("portal.administrator.groups");
@@ -177,6 +185,11 @@
{
return mandatoryGroups_;
}
+
+ public List<String> getMandatoryMSTypes()
+ {
+ return mandatoryMSTypes_;
+ }
public void setAdminGroups(String adminGroups)
{
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2009-11-06 08:59:08 UTC (rev 512)
@@ -21,6 +21,7 @@
import org.exoplatform.commons.utils.ObjectPageList;
import org.exoplatform.commons.utils.PageList;
+import org.exoplatform.portal.config.UserACL;
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.web.application.ApplicationMessage;
@@ -115,6 +116,15 @@
uiApp.addMessage(new ApplicationMessage("UIMembershipList.msg.InUse", null));
return;
}
+
+ // Check to see whether given membershiptype is mandatory or not
+ UserACL acl = uiMembership.getApplicationComponent(UserACL.class);
+ List<String> mandatories = acl.getMandatoryMSTypes();
+ if(!mandatories.isEmpty() && mandatories.contains(name)){
+ UIApplication uiApp = event.getRequestContext().getUIApplication();
+ uiApp.addMessage(new ApplicationMessage("UIMembershipList.msg.DeleteMandatory", null));
+ return;
+ }
OrganizationService service = uiMembership.getApplicationComponent(OrganizationService.class);
MembershipType membershipType = service.getMembershipTypeHandler().findMembershipType(name);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2009-11-06 08:59:08 UTC (rev 512)
@@ -317,6 +317,7 @@
</action>
<msg>
<InUse>لا يمكنك حذف هذه العضوية لأنها في الاستخدام</InUse>
+ <DeleteMandatory>لا يمكنك حذف هذه العضوية لأنه إلزامية</DeleteMandatory>
</msg>
</UIMembershipList>
<!--
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2009-11-06 08:59:08 UTC (rev 512)
@@ -162,7 +162,8 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Mitgliedschaft ändern
UIMembershipList.action.title.DeleteMembership=Mitgliedschaft löschen
-UIMembershipList.msg.InUse=Sie können die Mitgliedschaft nicht löschen, da es benutzt wird
+UIMembershipList.msg.InUse=Sie können die Mitgliedschaft nicht löschen, da es benutzt wird
+UIMembershipList.msg.DeleteMandatory=Sie k\u00F6nnen nicht gel\u00F6scht werden, weil sie die Mitgliedschaft ist obligatorisch
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupMembershipForm.title=Mitglied hinzufügen
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2009-11-06 08:59:08 UTC (rev 512)
@@ -171,7 +171,8 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Edit Membership
UIMembershipList.action.title.DeleteMembership=Delete Membership
-UIMembershipList.msg.InUse=You can not delete this membership because it is in use
+UIMembershipList.msg.InUse=You can not delete this membership because it is in use
+UIMembershipList.msg.DeleteMandatory=You can not delete this membership because it is mandatory
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupMembershipForm.title=Add member
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.xml 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.xml 2009-11-06 08:59:08 UTC (rev 512)
@@ -317,6 +317,7 @@
</action>
<msg>
<InUse>You can not delete this membership because it is in use</InUse>
+ <DeleteMandatory>You can not delete this membership because it is mandatory</DeleteMandatory>
</msg>
</UIMembershipList>
<!--
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2009-11-06 08:59:08 UTC (rev 512)
@@ -172,6 +172,7 @@
UIMembershipList.action.title.EditMembership=Editer le r\u00f4le
UIMembershipList.action.title.DeleteMembership=Supprimer le r\u00f4le
UIMembershipList.msg.InUse=Vous ne pouvez pas supprimer ce r\u00f4le car il est utilis\u00e9
+UIMembershipList.msg.DeleteMandatory=Vous ne pouvez pas supprimer cette adh\u00E9sion parce qu'il est obligatoire
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupMembershipForm.title=Ajouter un utilisateur dans le groupe
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2009-11-06 08:59:08 UTC (rev 512)
@@ -162,7 +162,8 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=lidmaatschap wijzigen
UIMembershipList.action.title.DeleteMembership=lidmaatschap verwijderen
-UIMembershipList.msg.InUse=Lidmaatschap kan verwijderd worden omdat het in gebruik is
+UIMembershipList.msg.InUse=Lidmaatschap kan verwijderd worden omdat het in gebruik is
+UIMembershipList.msg.DeleteMandatory=U kunt dit lidmaatschap niet verwijderen omdat het verplicht is
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupMembershipForm.title=Lid toevoegen
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2009-11-06 08:59:08 UTC (rev 512)
@@ -162,7 +162,8 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Изменить участие
UIMembershipList.action.title.DeleteMembership=Отменить участие
-UIMembershipList.msg.InUse=Невозможно отменить участие.
+UIMembershipList.msg.InUse=Невозможно отменить участие.
+UIMembershipList.msg.DeleteMandatory=\u0412\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E \u0447\u043B\u0435\u043D\u0441\u0442\u0432\u043E, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u043E\u043D\u043E \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u043C
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupMembershipForm.title=Добавить участника
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2009-11-06 08:59:08 UTC (rev 512)
@@ -161,7 +161,8 @@
UIMembershipList.header.description=#{word.description}
UIMembershipList.action.title.EditMembership=Редагувати клас
UIMembershipList.action.title.DeleteMembership=Видалити клас
-UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
+UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
+UIMembershipList.msg.DeleteMandatory=\u0412\u0456\u0434 \u0442\u0430\u043A\u0438\u0445 \u043C\u043E\u0436\u043D\u0430 \u043D\u0456 \u0432\u0438\u043B\u0443\u0447\u0456\u0442\u044C \u0446\u0435 \u043F\u0440\u0438\u043D\u0430\u043B\u0435\u0436\u043D\u0456\u0441\u0442\u044C \u043E\u0441\u043A\u0456\u043B\u044C\u043A\u0438 \u0432\u0456\u043D \u043E\u0434\u0438\u043D \u043E\u0431\u043E\u0432'\u044F\u0437\u043A\u043E\u0432\u0438\u0439
##org.exoplatform.organization.webui.component.UIGroupMembershipForm
UIGroupMembershipForm.title=Додати учасника
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2009-11-06 08:59:08 UTC (rev 512)
@@ -317,6 +317,7 @@
</action>
<msg>
<InUse>Bạn không thể xóa thành viên này vì nó đang sử dụng</InUse>
+ <DeleteMandatory>Bạn không thể xóa membership này vì nó là mandatory</DeleteMandatory>
</msg>
</UIMembershipList>
<!--
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-11-06 08:02:38 UTC (rev 511)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-11-06 08:59:08 UTC (rev 512)
@@ -78,13 +78,18 @@
<description>guests group</description>
<value>/platform/guests</value>
</value-param>
- <values-param>
- <name>mandatory.groups</name>
- <description>Groups that can not be deleted.</description>
- <value>/platform/administrators</value>
- <value>/platform/users</value>
- <value>/platform/guests</value>
- </values-param>
+ <values-param>
+ <name>mandatory.groups</name>
+ <description>Groups that can not be deleted.</description>
+ <value>/platform/administrators</value>
+ <value>/platform/users</value>
+ <value>/platform/guests</value>
+ </values-param>
+ <values-param>
+ <name>mandatory.mstypes</name>
+ <description>Membership type that can not be deleted.</description>
+ <value>member</value>
+ </values-param>
</init-params>
</component>
15 years, 1 month
gatein SVN: r511 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-11-06 03:02:38 -0500 (Fri, 06 Nov 2009)
New Revision: 511
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl
Log:
GTNPORTAL-82 Should show message when user does not have the right to add navigation ( Mary/Demo)
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl 2009-11-06 05:15:57 UTC (rev 510)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIAddGroupNavigation.gtmpl 2009-11-06 08:02:38 UTC (rev 511)
@@ -6,9 +6,7 @@
listGroupNames = uicomponent.loadGroups();
uicomponent.renderChild(UIVirtualList.class); %>
- <% if (listGroupNames == null){ %>
- <%=_ctx.appRes("UIAddGroupNavigation.Label.NoPermission")%>
- <% } %>
+
<div class="UIAction">
<table class="ActionContainer">
<tr>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl 2009-11-06 05:15:57 UTC (rev 510)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/navigation/UIGroupGrid.gtmpl 2009-11-06 08:02:38 UTC (rev 511)
@@ -6,7 +6,10 @@
def listGroupNames = (List<String>)uicomponent.getBeans();
def parent = uicomponent.getParent();
%>
-<div id="$uicomponent.id" class="FeedBox">
+<div id="$uicomponent.id" class="FeedBox">
+ <% if (listGroupNames.size() == 0){ %>
+ <%=_ctx.appRes("UIAddGroupNavigation.Label.NoPermission")%>
+ <% } %>
<%
for(groupName in listGroupNames) {
addLink = parent.event("AddNavigation", java.net.URLEncoder.encode(groupName));
15 years, 1 month
gatein SVN: r510 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-06 00:15:57 -0500 (Fri, 06 Nov 2009)
New Revision: 510
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_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-199: Problem 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 2009-11-06 04:08:34 UTC (rev 509)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIAddApplicationForm.java 2009-11-06 05:15:57 UTC (rev 510)
@@ -257,6 +257,12 @@
UIFormRadioBoxInput uiRadio = uiForm.getUIInput("application");
String displayName = uiForm.getUIStringInput(FIELD_NAME).getValue();
+ if (uiForm.getApplications().size() == 0)
+ {
+ ctx.getUIApplication().addMessage(new ApplicationMessage("UIAddApplicationForm.msg.appNotExists", null));
+ ctx.addUIComponentToUpdateByAjax(uiOrganizer);
+ return;
+ }
Application tmp = uiForm.getApplications().get(Integer.parseInt(uiRadio.getValue()));
// check portet name is exist
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 2009-11-06 04:08:34 UTC (rev 509)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2009-11-06 05:15:57 UTC (rev 510)
@@ -133,6 +133,7 @@
</action>
<msg>
<PortletExist>!إن هذه الخدمة في الفئة ، يرجى اختيار واحدة أخرى</PortletExist>
+ <appNotExists>Please select an application.</appNotExists>
</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 2009-11-06 04:08:34 UTC (rev 509)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2009-11-06 05:15:57 UTC (rev 510)
@@ -72,6 +72,7 @@
UIAddApplicationForm.header.description=Description
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.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_ru.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2009-11-06 04:08:34 UTC (rev 509)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ru.properties 2009-11-06 05:15:57 UTC (rev 510)
@@ -72,6 +72,7 @@
UIAddApplicationForm.header.description=Описание
UIAddApplicationForm.action.Add=Добавить
UIAddApplicationForm.msg.PortletExist=Это приложение уже в указанной категории. Выберите другую категори.
+UIAddApplicationForm.msg.appNotExists=Please select an application.
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 2009-11-06 04:08:34 UTC (rev 509)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_uk.properties 2009-11-06 05:15:57 UTC (rev 510)
@@ -72,6 +72,7 @@
UIAddApplicationForm.header.description=Опис
UIAddApplicationForm.action.Add=Додати
UIAddApplicationForm.msg.PortletExist=Це застосування вже є в категорії, будь ласка, оберіть інше!
+UIAddApplicationForm.msg.appNotExists=Please select an application.
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 2009-11-06 04:08:34 UTC (rev 509)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2009-11-06 05:15:57 UTC (rev 510)
@@ -133,6 +133,7 @@
</action>
<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>
</msg>
<label>
<displayName>#{label.displayName}</displayName>
15 years, 1 month