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 
12310: Merged V2.2 to V3.0
    12306: Merged V2.1 to V2.2
      12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
  12312: Merged V2.2 to V3.0
    12311: Merged V2.1 to V2.2
      11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
  12316: Fix for merge issue
  12317: Merged 2.1 to 3.0
    12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
  12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
  12321: Missing file from previous checkin
  12324: Merged 2.2 to 3.0
    12320: Merged 2.1 to 2.2
      11682: Fix for ETWOONE-87: Behavior of delete cascade
  12326: Merge 2.1 to 3.0
    11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-22 13:20:37 +00:00
parent d34f99c2d9
commit d5f42006f8
57 changed files with 1023 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/ui/repo/renderer/BaseMultiValueRenderer.java
View File

@@ -262,7 +262,7 @@ public abstract class BaseMultiValueRenderer extends BaseRenderer
if (value instanceof NodeRef)
{
out.write(Repository.getNameForNode(nodeService, (NodeRef)value));
out.write(Utils.encode(Repository.getNameForNode(nodeService, (NodeRef)value)));
}
else if (value instanceof Date)
{
@@ -290,7 +290,7 @@ public abstract class BaseMultiValueRenderer extends BaseRenderer
}
else
{
out.write(value.toString());
out.write(Utils.encode(value.toString()));
}
out.write("  ");

6
source/java/org/alfresco/web/ui/repo/renderer/MultilingualTextAreaRenderer.java
View File

@@ -51,7 +51,11 @@ public class MultilingualTextAreaRenderer extends HtmlTextareaRenderer
// to workaround a bug in MyFaces where it appears a new line gets removed
// in the process view/edit process add it back (ETWOONE-91)
Object value = ((ValueHolder) uiComponent).getValue();
String valueStr = "\r\n" + (String)value;
String valueStr = null;
if (value != null)
{
valueStr = "\r\n" + (String)value;
}
((ValueHolder) uiComponent).setValue(valueStr);
super.encodeTextArea(facesContext, uiComponent);
}