[gatein-commits] gatein SVN: r4898 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Nov 2 05:31:38 EDT 2010


Author: thomas.heute at jboss.com
Date: 2010-11-02 05:31:36 -0400 (Tue, 02 Nov 2010)
New Revision: 4898

Modified:
   portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.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_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_es.properties
   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_it.properties
   portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
   portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
   portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.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_pt_BR.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/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
   portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
Log:
GTNPORTAL-1616 XSS issue in user creation page
Needed to rollback: GTNPORTAL-1082: Possible to inject javascript code into MembershipType description


Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java	2010-11-02 09:31:36 UTC (rev 4898)
@@ -19,6 +19,8 @@
 
 package org.exoplatform.organization.webui.component;
 
+import java.util.List;
+
 import org.exoplatform.commons.utils.ListAccess;
 import org.exoplatform.commons.utils.ListAccessImpl;
 import org.exoplatform.commons.utils.StatelessPageList;
@@ -26,18 +28,12 @@
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.services.organization.MembershipType;
 import org.exoplatform.services.organization.OrganizationService;
-import org.gatein.common.text.EntityEncoder;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-
 /**
  * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
  * @version $Revision$
  */
-public class FindMembershipTypesPageList extends StatelessPageList<FindMembershipTypesPageList.UIMembershipType>
+public class FindMembershipTypesPageList extends StatelessPageList<MembershipType>
 {
 
    public FindMembershipTypesPageList(int pageSize)
@@ -46,65 +42,14 @@
    }
 
    @Override
-   protected ListAccess<UIMembershipType> connect() throws Exception
+   protected ListAccess<MembershipType> connect() throws Exception
    {
       ExoContainer container = PortalContainer.getInstance();
       OrganizationService service = (OrganizationService)container.getComponentInstance(OrganizationService.class);
       List<MembershipType> memberships = (List<MembershipType>)service.getMembershipTypeHandler().findMembershipTypes();
       
-      return new ListAccessImpl<UIMembershipType>(UIMembershipType.class, convertMembershipTypes(memberships));
-   }
-   
-   private List<UIMembershipType> convertMembershipTypes(List<MembershipType> memberships)
-   {
-      List<UIMembershipType> types = new ArrayList<UIMembershipType>(memberships.size());
-      for (MembershipType type: memberships)
-      {
-         types.add(new UIMembershipType(type));
-      }
-      return types;
-   }
-   
-   public class UIMembershipType implements Serializable
-   {
-      private MembershipType mType;
-      
-      public UIMembershipType(MembershipType mType)
-      {
-         this.mType = mType;
-      }
-      
-      public String getName()
-      {
-         return mType.getName();
-      }
-      
-      public Date getCreatedDate()
-      {
-         return mType.getCreatedDate();
-      }
+      return new ListAccessImpl<MembershipType>(MembershipType.class, memberships);
 
-      public Date getModifiedDate()
-      {
-         return mType.getModifiedDate();
-      }
-
-      public String getDescription()
-      {
-         return (mType.getDescription() != null? mType.getDescription():"");
-      }
-      
-      public String getEncodedDescription()
-      {
-         if (getDescription() != null)
-         {
-            EntityEncoder encoder = EntityEncoder.FULL;
-            return encoder.encode(getDescription());
-         }
-         else
-         {
-            return null;
-         }
-      }
    }
+
 }

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java	2010-11-02 09:31:36 UTC (rev 4898)
@@ -45,7 +45,7 @@
 public class UIListMembershipType extends UIContainer
 {
 
-   private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "encodedDescription"};
+   private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "description"};
 
    private static String[] USER_ACTION = {"EditMembership", "DeleteMembership"};
 

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -169,7 +169,7 @@
 UIMembershipList.header.createdDate=Erstelldatum
 UIMembershipList.header.modifiedDate=Bearbeitungsdatum
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Rolle bearbeiten
 UIMembershipList.action.title.DeleteMembership=Rolle l\u00f6schen
 UIMembershipList.msg.InUse=Sie k\u00f6nnen die Rolle nicht l\u00f6schen, weil sie benutzt wird.
@@ -254,4 +254,4 @@
 UITabPane.title.UISharedNavigation=Navigation der Gruppenseiten 
 UISharedNavigation.label.userNavigation=Name der Benutzerseiten-Navigation
 UISharedNavigation.label.priority=Priorit\u00e4t
-UISharedNavigation.action.Save=Speichern
+UISharedNavigation.action.Save=Speichern
\ No newline at end of file

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -170,7 +170,7 @@
 UIMembershipList.header.createdDate=Created date
 UIMembershipList.header.modifiedDate=Modified date
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+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

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -169,7 +169,7 @@
 UIMembershipList.header.createdDate=Fecha de Creaci\u00f3n
 UIMembershipList.header.modifiedDate=Fecha de Modificaci\u00f3n
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Editar Afiliaci\u00f3n
 UIMembershipList.action.title.DeleteMembership=Borrar Afiliaci\u00f3n
 UIMembershipList.msg.InUse=No puedes borrar esta afiliaci\u00f3n porque est\u00e1 siendo usada

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -168,7 +168,7 @@
 UIMembershipList.header.createdDate=Date de cr\u00e9ation
 UIMembershipList.header.modifiedDate=Date de modification
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 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

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -169,7 +169,7 @@
 UIMembershipList.header.createdDate=Data di creazione
 UIMembershipList.header.modifiedDate=Data di modifica
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Modifica il Membership
 UIMembershipList.action.title.DeleteMembership=Elimina il Membership
 UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -170,7 +170,7 @@
 UIMembershipList.header.createdDate=\u4f5c\u6210\u65e5
 UIMembershipList.header.modifiedDate=\u66f4\u65b0\u65e5
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u7de8\u96c6
 UIMembershipList.action.title.DeleteMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u524a\u9664
 UIMembershipList.msg.InUse=\u3053\u306e\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u306f\u4f7f\u7528\u4e2d\u306a\u306e\u3067\u524a\u9664\u3067\u304d\u307e\u305b\u3093

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml	2010-11-02 09:31:36 UTC (rev 4898)
@@ -259,7 +259,7 @@
          <createdDate>생성된 날짜</createdDate>
          <modifiedDate>수정된 날짜</modifiedDate>
          <action>#{word.action}</action>
-         <encodedDescription>#{word.description}</encodedDescription>
+         <description>#{word.description}</description>
       </header>
       <action>
          <title>
@@ -376,4 +376,4 @@
       </label>
       <deleteGroup>이 그룹을 삭제하시겠습니까?</deleteGroup>
    </UIGroupManagement>
-</bundle>
+</bundle>
\ No newline at end of file

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -170,7 +170,7 @@
 UIMembershipList.header.createdDate=\u092c\u0928\u093e\u090f\u0915\u094b \u092e\u093f\u0924\u0940
 UIMembershipList.header.modifiedDate=\u092a\u0930\u093f\u092e\u093e\u0930\u094d\u091c\u0928 \u0917\u0930\u0947\u0915\u094b \u092e\u093f\u0924\u0940
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u0938\u092e\u094d\u092a\u093e\u0926\u0928
 UIMembershipList.action.title.DeleteMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928\u0941
 UIMembershipList.msg.InUse=\u0924\u092a\u093e\u0908\u0902 \u092f\u094b \u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928 \u0938\u0915\u094d\u0928\u0941 \u0939\u0941\u0928\u094d\u0928 \u0915\u093f\u0928\u0915\u0940 \u092f\u094b \u092a\u094d\u0930\u092f\u094b\u0917 \u092d\u0907\u0930\u0939\u0947\u0915\u094b \u091b

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -166,7 +166,7 @@
 UIMembershipList.header.createdDate=Gecre\u00EBerd datum
 UIMembershipList.header.modifiedDate=Gewijzigde datum
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Wijzig rol
 UIMembershipList.action.title.DeleteMembership=Verwijder rol
 UIMembershipList.msg.InUse=U kan deze rol niet verwijderen omdat die in gebruik is.

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -169,7 +169,7 @@
 UIMembershipList.header.createdDate=Data de Criação
 UIMembershipList.header.modifiedDate=Data de modificação
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Editar Papel
 UIMembershipList.action.title.DeleteMembership=Remover Papel
 UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo.

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -159,7 +159,7 @@
 UIMembershipList.header.createdDate=Дата создание
 UIMembershipList.header.modifiedDate=Дата изменения
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Изменить участие
 UIMembershipList.action.title.DeleteMembership=Отменить участие
 UIMembershipList.msg.InUse=Невозможно отменить участие.

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties	2010-11-02 09:31:36 UTC (rev 4898)
@@ -158,7 +158,7 @@
 UIMembershipList.header.createdDate=Дата створення
 UIMembershipList.header.modifiedDate=Дата змін
 UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.encodedDescription=#{word.description}
+UIMembershipList.header.description=#{word.description}
 UIMembershipList.action.title.EditMembership=Редагувати клас
 UIMembershipList.action.title.DeleteMembership=Видалити клас
 UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
@@ -242,4 +242,4 @@
 UITabPane.title.UISharedNavigation=Навігаційна сторінка групи 
 UISharedNavigation.label.userNavigation=Назва навігаційної сторінки користувача
 UISharedNavigation.label.priority=Пріоритет
-UISharedNavigation.action.Save=Зберегти
+UISharedNavigation.action.Save=Зберегти
\ No newline at end of file

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	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml	2010-11-02 09:31:36 UTC (rev 4898)
@@ -307,7 +307,7 @@
       <createdDate>Ngày tạo</createdDate>
       <modifiedDate>Ngày sửa</modifiedDate>
       <action>#{word.action}</action>
-      <encodedDescription>#{word.description}</encodedDescription>
+      <description>#{word.description}</description>
     </header>
     <action>
       <title>

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml	2010-11-02 09:31:36 UTC (rev 4898)
@@ -258,7 +258,7 @@
          <createdDate>创建日期</createdDate>
          <modifiedDate>修改日期</modifiedDate>
          <action>#{word.action}</action>
-         <encodedDescription>#{word.description}</encodedDescription>
+         <description>#{word.description}</description>
       </header>
       <action>
          <title>

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml	2010-11-02 07:36:22 UTC (rev 4897)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml	2010-11-02 09:31:36 UTC (rev 4898)
@@ -259,7 +259,7 @@
          <createdDate>建立日期</createdDate>
          <modifiedDate>修改日期</modifiedDate>
          <action>#{word.action}</action>
-         <encodedDescription>#{word.description}</encodedDescription>
+         <description>#{word.description}</description>
       </header>
       <action>
          <title>



More information about the gatein-commits mailing list