Merge pull request #52 from tarekabou-chanab/PRESIDECMS-185

PRESIDECMS-185 make sure all arguments available to preparefilter int…
pixl8 · Oct 19, 2015 · 5d859d5 · 5d859d5
2 parents e03d59a + 5271481
commit 5d859d5
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/system/services/presideObjects/PresideObjectService.cfc b/system/services/presideObjects/PresideObjectService.cfc
@@ -351,7 +351,7 @@ component singleton=true autodoc=true displayName="Preside Object Service" {
 		var interceptionArgs       = arguments;
 		    interceptionArgs.newId = newId;
 		    interceptionArgs.result = result;
-		    
+
 		_announceInterception( "postInsertObjectData", interceptionArgs );
 
 		return newId;
@@ -461,14 +461,9 @@ component singleton=true autodoc=true displayName="Preside Object Service" {
 		}
 
 		preparedFilter = _prepareFilter(
-			  objectName        = arguments.objectName
-			, id                = arguments.id
-			, filter            = arguments.filter
-			, filterParams      = arguments.filterParams
-			, extraFilters      = arguments.extraFilters
-			, savedFilters      = arguments.savedFilters
-			, adapter           = adapter
-			, columnDefinitions = obj.properties
+			  adapter            = adapter
+			, columnDefinitions  = obj.properties
+			, argumentCollection = arguments
 		);
 
 		transaction {