Merge pull request BroadleafCommerce#11 from BroadleafCommerce/qa-732-scroll

collection grids in Entity forms weren't paging correctly

Author: jefffischer

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/AdminEntityService.java

@@ -252,6 +252,20 @@ public Map<String, DynamicResultSet> getRecordsForAllSubCollections(PersistenceP
             Entity containingEntity, List<SectionCrumb> sectionCrumb)
             throws ServiceException;
 
+    /**
+     * overloading containing paging parameters
+     * @param ppr
+     * @param containingEntity
+     * @param startIndex
+     * @param maxIndex
+     * @param sectionCrumb
+     * @return
+     * @throws ServiceException
+     */
+    public Map<String, DynamicResultSet> getRecordsForAllSubCollections(PersistencePackageRequest ppr,
+            Entity containingEntity, Integer startIndex, Integer maxIndex, List<SectionCrumb> sectionCrumb)
+            throws ServiceException;
+
     /**
      * Adds an item into the specified collection
      * 

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/AdminEntityServiceImpl.java

@@ -351,23 +351,30 @@ public PersistenceResponse getRecordsForCollection(ClassMetadata containingClass
     }
 
     @Override
-    public Map<String, DynamicResultSet> getRecordsForAllSubCollections(PersistencePackageRequest ppr, Entity containingEntity, List<SectionCrumb> sectionCrumb)
+    public Map<String, DynamicResultSet> getRecordsForAllSubCollections(PersistencePackageRequest ppr, Entity containingEntity, Integer startIndex, Integer maxIndex, List<SectionCrumb> sectionCrumb)
             throws ServiceException {
         Map<String, DynamicResultSet> map = new HashMap<String, DynamicResultSet>();
 
         PersistenceResponse response = getClassMetadata(ppr);
         ClassMetadata cmd = response.getDynamicResultSet().getClassMetaData();
         for (Property p : cmd.getProperties()) {
-            if (ArrayUtils.contains(p.getMetadata().getAvailableToTypes(), containingEntity.getType()[0]) 
+            if (ArrayUtils.contains(p.getMetadata().getAvailableToTypes(), containingEntity.getType()[0])
                     && p.getMetadata() instanceof CollectionMetadata) {
-                PersistenceResponse response2 = getRecordsForCollection(cmd, containingEntity, p, null, null, null, sectionCrumb);
+                PersistenceResponse response2 = getRecordsForCollection(cmd, containingEntity, p, null, startIndex, maxIndex, sectionCrumb);
                 map.put(p.getName(), response2.getDynamicResultSet());
             }
         }
 
         return map;
     }
 
+    @Override
+    public Map<String, DynamicResultSet> getRecordsForAllSubCollections(PersistencePackageRequest ppr, Entity containingEntity, List<SectionCrumb> sectionCrumb)
+            throws ServiceException {
+
+        return getRecordsForAllSubCollections(ppr, containingEntity, null, null, sectionCrumb);
+    }
+
     @Override
     public PersistenceResponse addSubCollectionEntity(EntityForm entityForm, ClassMetadata mainMetadata, Property field,
             Entity parentEntity, List<SectionCrumb> sectionCrumbs)

admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/js/admin/components/listGrid-paginate.js

@@ -677,14 +677,7 @@
 
                         // Fetch records if necessary
                         $.doTimeout('fetch', fetchDebounce, function() {
-                            if (singleGrid) {
-                                var url = null;
-                            } else if (isAssetGrid) {
-                                var url = $tbody.closest('table').data('currenturl');
-                            } else {
-                                var url = $tbody.closest('table').data('path');
-                            }
-                            
+                        	var url = $tbody.closest('table').data('path');
                             BLCAdmin.listGrid.paginate.loadRecords($tbody, url);
                         });