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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
70754: Modifications to files after merge from WAT1 to HBF so that the two branches are the same except for version.properties and pom.xml versions
   These changes need to be checked as they may have been incorrectly merged to WAT1 in the first place.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Draper
2014-05-19 13:04:59 +00:00
parent 1918e24a74
commit 1f63c49fb1
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.lib.js
View File

@@ -575,6 +575,11 @@ function splitQNamePath(node, rootNodeDisplayPath, rootNodeQNamePath, qnameOnly)
} }
} }
if (overriden && parts == null)
{
displayPath.unshift("");
}
return (parts !== null ? parts : [ null, null, displayPath ]); return (parts !== null ? parts : [ null, null, displayPath ]);
} }
@@ -945,7 +950,16 @@ function getSearchResults(params)
} }
else else
{ {
formQuery += (first ? '' : ' AND ') + escapeQName(propName) + ':\\"' + propValue + '\\"'; var index = propValue.lastIndexOf(" ");
formQuery += (first ? '' : ' AND ') + escapeQName(propName)
if (index > 0 && index < propValue.length - 1)
{
formQuery += ':(' + propValue + ')';
}
else
{
formQuery += ':"' + propValue + '"';
}
} }
first = false; first = false;
} }
@@ -1015,7 +1029,7 @@ function getSearchResults(params)
} }
} }
// ensure a TYPE is specified - if not, then add one to remove system objects etc. from result sets // ensure a TYPE is specified - if no add one to remove system objects from result sets
if (ftsQuery.indexOf("TYPE:\"") === -1 && ftsQuery.indexOf("TYPE:'") === -1) if (ftsQuery.indexOf("TYPE:\"") === -1 && ftsQuery.indexOf("TYPE:'") === -1)
{ {
ftsQuery += ' AND (+TYPE:"cm:content" OR +TYPE:"cm:folder")'; ftsQuery += ' AND (+TYPE:"cm:content" OR +TYPE:"cm:folder")';