From 62d2d8bcbbd38e2fcc2342c7e047f79fe92a9bbe Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 11:52:55 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 92529: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 92463: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1) 92370: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5) 92314: Merged DEV to V4.1-BUG-FIX (4.1.10) 92170 : MNT-2118 : Share inconsistencies when displaying locked files with tags - Ignore working copies at search for tags 92132 : MNT-2118 : Share inconsistencies when displaying locked files with tags - Restore number of tag at check out 92146 : MNT-2118 : Share inconsistencies when displaying locked files with tags - Test failure fixed git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webscripts/org/alfresco/collaboration/tagQuery.get.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js b/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js index 5fcbf5815b..1717d2a590 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js @@ -47,6 +47,8 @@ function tagQuery() query += "\" AND "; } query += "ASPECT:\"{http://www.alfresco.org/model/content/1.0}taggable\""; + //MNT-2118 Share inconsistencies when displaying locked files with tags + query += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\""; var taggedNodes = search.luceneSearch(query);