ETHREEOH-1098 - Document List isn't filtering all forum node types

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2009-03-17 14:44:16 +00:00
parent 555d1df106
commit b4758f446d
2 changed files with 6 additions and 1 deletions

View File

@@ -22,6 +22,8 @@ function getFilterParams(filter, parsedArgs)
case "all": case "all":
var filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\""; var filterQuery = "+PATH:\"" + parsedArgs.rootNode.qnamePath + "//*\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}folder\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\"";
@@ -71,6 +73,8 @@ function getFilterParams(filter, parsedArgs)
filterQuery += " +@cm\\:" + dateField + ":[" + fromQuery + "T00\\:00\\:00.000 TO " + toQuery + "T23\\:59\\:59.999]"; filterQuery += " +@cm\\:" + dateField + ":[" + fromQuery + "T00\\:00\\:00.000 TO " + toQuery + "T23\\:59\\:59.999]";
filterQuery += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\""; filterQuery += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/content/1.0}folder\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forum\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}topic\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\""; filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}post\"";
@@ -102,6 +106,7 @@ function getFilterParams(filter, parsedArgs)
default: default:
var filterQuery = "+PATH:\"" + parsedArgs.parentNode.qnamePath + "/*\""; var filterQuery = "+PATH:\"" + parsedArgs.parentNode.qnamePath + "/*\"";
filterQuery += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\""; filterQuery += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
filterQuery += " -TYPE:\"{http://www.alfresco.org/model/forum/1.0}forums\"";
filterParams.query = filterQuery; filterParams.query = filterQuery;
break; break;

View File

@@ -22,7 +22,7 @@ function getTreenode(siteId, path)
// Look for folders in the parentNode // Look for folders in the parentNode
for each(item in parsedArgs.parentNode.children) for each(item in parsedArgs.parentNode.children)
{ {
if (item.isContainer) if (item.type == "{http://www.alfresco.org/model/content/1.0}folder")
{ {
items.push(item); items.push(item);
} }