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
This commit is contained in:
Will Abson
2014-09-03 16:19:21 +00:00
parent 383b977c08
commit 9f2d601915
3 changed files with 7 additions and 7 deletions

View File

@@ -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<String> scopedSites = null;
if (scopedSitesJsonArray != null)
{