From 9f2d601915bf12e321eb395511496443657ac464 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 3 Sep 2014 16:19:21 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 80673: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 78188: Made facet's "scope" and "scopedSites" properties, optional when updating/saving a facet. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../solr/facet/solr-facet-config-admin.post.desc.xml | 4 ++-- .../solr/facet/solr-facet-config-admin.put.desc.xml | 4 ++-- .../solr/facet/AbstractSolrFacetConfigAdminWebScript.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml index e1ec41b141..07dff4b647 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml @@ -17,13 +17,13 @@ "hitThreshold" : 1, "minFilterValueLength" : 5, "sortBy" : "ALPHABETICALLY", - "scope" : "SCOPED_SITES", + "scope" : "SCOPED_SITES", // if not provided, default value is "ALL" "scopedSites" : [ "site3", "site2", "site1" ], - "isEnabled" : true // optional + "isEnabled" : true // if not provided, default value is false } Notes: diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml index 080373fb2b..8b9be2fb85 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml @@ -19,13 +19,13 @@ "hitThreshold" : 1, "minFilterValueLength" : 5, "sortBy" : "ALPHABETICALLY", - "scope" : "SCOPED_SITES", + "scope" : "SCOPED_SITES", // if not provided, default value is "ALL" "scopedSites" : [ "site3", "site2", "site1" ], - "isEnabled" : true // optional + "isEnabled" : true // if not provided, default value is false }
Notes: diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java b/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java index e8d51aee8b..ab3a3c3544 100644 --- a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java @@ -111,9 +111,9 @@ public abstract class AbstractSolrFacetConfigAdminWebScript extends DeclarativeW final int hitThreshold = json.getInt(PARAM_HIT_THRESHOLD); final int minFilterValueLength = json.getInt(PARAM_MIN_FILTER_VALUE_LENGTH); final String sortBy = json.getString(PARAM_SORT_BY); - final String scope = json.getString(PARAM_SCOPE); - final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), true); - JSONArray scopedSitesJsonArray = json.getJSONArray(PARAM_SCOPED_SITES); + final String scope = getValue(String.class, json.opt(PARAM_SCOPE), "ALL"); + final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), false); + JSONArray scopedSitesJsonArray = getValue(JSONArray.class, json.opt(PARAM_SCOPED_SITES), null); Set scopedSites = null; if (scopedSitesJsonArray != null) {