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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
60032: Merged BRANCHES/DEV/43UIDEV to HEAD-BUG-FIX:
      This branch contained the Aikau and Surf framework updates implemented during the development hiatus post-4.2 completion. This features the change of Surf from 1.2.0 to Surf 1.2.1 which is for v4.3 releases only.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 10:12:44 +00:00
parent 465ac6628b
commit 350b8883ef
4 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -533,6 +533,8 @@ public class Search extends BaseScopableProcessorExtension
{
Object[] results = null;
// convert values from JS to Java - may contain native JS object such as ConsString etc.
search = new ValueConverter().convertValueForJava(search);
if (search instanceof Serializable)
{
Serializable obj = new ValueConverter().convertValueForRepo((Serializable)search);

10
source/java/org/alfresco/repo/jscript/ValueConverter.java
View File

@@ -158,11 +158,11 @@ public class ValueConverter
}
else if (value instanceof ChildAssociation)
{
value = ((ChildAssociation)value).getChildAssociationRef();
value = ((ChildAssociation)value).getChildAssociationRef();
}
else if (value instanceof Association)
{
value = ((Association)value).getAssociationRef();
value = ((Association)value).getAssociationRef();
}
else if (value instanceof Wrapper)
{
@@ -275,6 +275,12 @@ public class ValueConverter
}
value = list;
}
else if (value instanceof CharSequence)
{
// Rhino has some interesting internal classes such as ConsString which cannot be cast to String
// but fortunately are instanceof CharSequence so we can toString() them.
value = value.toString();
}
return value;
}