inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12729: Merged V2.2 to V3.0
      12727: Further fix for ETWOTWO-987: HTML shown on WCM wizard summary pages

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2009-01-14 13:10:41 +00:00
parent e1da4cb9d4
commit 2c9e18b13b
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/web/bean/wcm/DescriptionAttributeHelper.java
View File

@@ -34,6 +34,7 @@ public class DescriptionAttributeHelper
{
return TABLE_BEGIN;
}
/**
*
* @param fc Current FacesContext
@@ -42,10 +43,31 @@ public class DescriptionAttributeHelper
* @return Returns a table line <code><tr><td>Localised field name:</td><td>Field value</td></tr></code>
*/
public static String getTableLine(FacesContext fc, String fieldName, String fieldValue)
{
return getTableLine(fc, fieldName, fieldValue, true);
}
/**
*
* @param fc Current FacesContext
* @param fieldName Field name
* @param fieldValue Field value
* @param encode Whether to encode the given value or not
* @return Returns a table line <code><tr><td>Localised field name:</td><td>Field value</td></tr></code>
*/
public static String getTableLine(FacesContext fc, String fieldName, String fieldValue, boolean encode)
{
StringBuilder line = new StringBuilder(128);
line.append(TRTD_BEGIN).append(Application.getMessage(fc, fieldName)).
append(TD_TD).append(Utils.encode(fieldValue)).append(TDTR_END);
line.append(TRTD_BEGIN).append(Application.getMessage(fc, fieldName)).append(TD_TD);
if (encode)
{
line.append(Utils.encode(fieldValue));
}
else
{
line.append(fieldValue);
}
line.append(TDTR_END);
return line.toString();
}
@@ -68,7 +90,7 @@ public class DescriptionAttributeHelper
{
return StringUtils.isEmpty(fieldValue) ?
SPAN_ITALIC_BEGIN + Application.getMessage(fc, "description_not_set") + SPAN_END :
fieldValue;
Utils.encode(fieldValue);
}
}