inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
84954: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83702: ACE-2639. Added javadoc stating that inherited properties are included in results for a single type/aspect, which they are.
      Added content class qname (type/aspect) to the JSON rsp as it's very helpful.
      Improved FacetablePropertyData's compareTo impl to properly sort on model,type,prop.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-09-20 09:26:40 +00:00
parent 9c0de55e32
commit 6d28d27188
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
View File

@@ -52,8 +52,8 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
public static final Log logger = LogFactory.getLog(FacetablePropertiesGet.class);
public static final String PROPERTIES_KEY = "properties";
private static final String MAX_ITEMS = "maxItems";
private static final String SKIP_COUNT = "skipCount";
private static final String QUERY_PARAM_MAX_ITEMS = "maxItems";
private static final String QUERY_PARAM_SKIP_COUNT = "skipCount";
private static final int DEFAULT_MAX_ITEMS_PER_PAGE = 50;
private static final String TEMPLATE_VAR_CLASSNAME = "classname";
@@ -125,8 +125,8 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
// Create paging
ScriptPagingDetails paging = new ScriptPagingDetails(
getNonNegativeIntParameter(req, MAX_ITEMS, DEFAULT_MAX_ITEMS_PER_PAGE),
getNonNegativeIntParameter(req, SKIP_COUNT, 0));
getNonNegativeIntParameter(req, QUERY_PARAM_MAX_ITEMS, DEFAULT_MAX_ITEMS_PER_PAGE),
getNonNegativeIntParameter(req, QUERY_PARAM_SKIP_COUNT, 0));
model.put(PROPERTIES_KEY, ModelUtil.page(filteredFacetableProperties, paging));
model.put("paging", ModelUtil.buildPaging(paging));
@@ -240,8 +240,15 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
@Override public int compareTo(FacetablePropertyData that)
{
final int modelComparison = this.propDef.getModel().getName().compareTo(that.propDef.getModel().getName());
return modelComparison != 0 ? modelComparison :
this.propDef.getName().compareTo(that.propDef.getName());
final int classComparison = this.propDef.getContainerClass().getName().compareTo(that.propDef.getContainerClass().getName());
final int propComparison = this.propDef.getName().compareTo(that.propDef.getName());
final int result;
if (modelComparison != 0) { result = modelComparison; }
else if (classComparison != 0) { result = classComparison; }
else { result = propComparison; }
return result;
}
}
}