inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
View File

@@ -17,13 +17,13 @@
"hitThreshold" : 1, "hitThreshold" : 1,
"minFilterValueLength" : 5, "minFilterValueLength" : 5,
"sortBy" : "ALPHABETICALLY", "sortBy" : "ALPHABETICALLY",
"scope" : "SCOPED_SITES", "scope" : "SCOPED_SITES", // if not provided, default value is "ALL"
"scopedSites" : [ "scopedSites" : [
"site3", "site3",
"site2", "site2",
"site1" "site1"
], ],
"isEnabled" : true // optional "isEnabled" : true // if not provided, default value is false
} }
Notes: Notes:

4
config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
View File

@@ -19,13 +19,13 @@
"hitThreshold" : 1, "hitThreshold" : 1,
"minFilterValueLength" : 5, "minFilterValueLength" : 5,
"sortBy" : "ALPHABETICALLY", "sortBy" : "ALPHABETICALLY",
"scope" : "SCOPED_SITES", "scope" : "SCOPED_SITES", // if not provided, default value is "ALL"
"scopedSites" : [ "scopedSites" : [
"site3", "site3",
"site2", "site2",
"site1" "site1"
], ],
"isEnabled" : true // optional "isEnabled" : true // if not provided, default value is false
}</pre><br/> }</pre><br/>
Notes: Notes:

6
source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
View File

@@ -111,9 +111,9 @@ public abstract class AbstractSolrFacetConfigAdminWebScript extends DeclarativeW
final int hitThreshold = json.getInt(PARAM_HIT_THRESHOLD); final int hitThreshold = json.getInt(PARAM_HIT_THRESHOLD);
final int minFilterValueLength = json.getInt(PARAM_MIN_FILTER_VALUE_LENGTH); final int minFilterValueLength = json.getInt(PARAM_MIN_FILTER_VALUE_LENGTH);
final String sortBy = json.getString(PARAM_SORT_BY); final String sortBy = json.getString(PARAM_SORT_BY);
final String scope = json.getString(PARAM_SCOPE); final String scope = getValue(String.class, json.opt(PARAM_SCOPE), "ALL");
final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), true); final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), false);
JSONArray scopedSitesJsonArray = json.getJSONArray(PARAM_SCOPED_SITES); JSONArray scopedSitesJsonArray = getValue(JSONArray.class, json.opt(PARAM_SCOPED_SITES), null);
Set<String> scopedSites = null; Set<String> scopedSites = null;
if (scopedSitesJsonArray != null) if (scopedSitesJsonArray != null)
{ {