From d685b2f36a19781da30d88f5f5b5535b5f1e298e Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Wed, 6 May 2009 19:53:30 +0000 Subject: [PATCH] MOB-589: Association control - Made the category and association controls permanent rather than 'experimental' - Tested various combinations of category and association fields - Object picker can now be used with properties and associations via 'maintainAddedRemovedItems' flag - Fixed some minor issues raised recently - Removed old unused pickerquery data web script git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repository/forms/pickeritems.post.json.js | 17 +++--- .../repository/forms/pickerquery.get.desc.xml | 9 ---- .../repository/forms/pickerquery.get.js | 53 ------------------- .../repository/forms/pickerquery.get.json.ftl | 2 - .../repository/forms/pickerquery.lib.ftl | 19 ------- 5 files changed, 11 insertions(+), 89 deletions(-) delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl delete mode 100644 config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js index f25a4d917d..c5f1ac3a30 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickeritems.post.json.js @@ -9,18 +9,23 @@ function main() { status.setCode(status.STATUS_BAD_REQUEST, "items parameter is not present"); return; - } + } + // convert the JSONArray object into a native JavaScript array var jsonItems = json.get("items"), numItems = jsonItems.length(), - item, itemKind, result; + item, result; for (count = 0; count < numItems; count++) - { - result = search.findNode(jsonItems.get(count)); - if (result != null) + { + item = jsonItems.get(count); + if (item != "") { - results.push(result); + result = search.findNode(item); + if (result != null) + { + results.push(result); + } } } diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml deleted file mode 100644 index 2c2d5c0536..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.desc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - PickerQuery - Service to return items to display in the object finder - /api/forms/picker/query - - user - required - internal - \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js deleted file mode 100644 index 1435997020..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.js +++ /dev/null @@ -1,53 +0,0 @@ -function main() -{ - // Extract args - var type = args['type']; - var filter = args['filter']; - var maxResults = args['maxResults']; - - if (type === null) - { - type = "cm:content"; - } - - if (maxResults === null) - { - maxResults = 100; - } - - if (logger.isLoggingEnabled()) - { - logger.log("type = " + type); - logger.log("filter = " + filter); - logger.log("maxResults = " + maxResults); - } - - var results = []; - - // execute a lucene query using the type parameter - var query = "+TYPE:\"" + type + "\""; - if (filter !== null) - { - query += " AND +@\\{http\\://www.alfresco.org/model/content/1.0\\}name:\"*" + filter + "*\""; - } - - results = search.luceneSearch(query); - - if (logger.isLoggingEnabled()) - { - logger.log("result count = " + results.length); - } - - if (results.length > maxResults) - { - results = results.slice(0, maxResults); - if (logger.isLoggingEnabled()) - { - logger.log("Restricted results size to " + maxResults); - } - } - - model.results = results; -} - -main(); diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl deleted file mode 100644 index 723a0328f9..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.get.json.ftl +++ /dev/null @@ -1,2 +0,0 @@ -<#import "pickerresults.lib.ftl" as pickerResultsLib /> -<@pickerResultsLib.pickerResultsJSON results=results /> \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl deleted file mode 100644 index 44d3a7b50c..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerquery.lib.ftl +++ /dev/null @@ -1,19 +0,0 @@ -<#macro pickerQueryJSON results> - <#escape x as jsonUtils.encodeJSONString(x)> -{ - "data" : - { - "items" : - [ - <#list results as row> - { - "name" : "${row.properties.name}", - "description" : "${row.displayPath}", - "nodeRef" : "${row.nodeRef}" - }<#if row_has_next>, - - ] - } -} - - \ No newline at end of file