Merge branch 'hotfix-10.8.37' into stable

pixl8 · Aug 1, 2017 · a70fd33 · a70fd33
2 parents 058fb17 + d9cb3b7
commit a70fd33
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 49 deletions.
diff --git a/system/assets/css/admin/specific/datamanager/object/listingTable.less b/system/assets/css/admin/specific/datamanager/object/listingTable.less
@@ -7,5 +7,9 @@
 			border-top : none;
 			display    : none; // revealed by js
 		}
+
+		.datatable-container {
+			position : relative;
+		}
 	}
 }
diff --git a/system/assets/js/admin/presidecore/datatables.resize.fix.js b/system/assets/js/admin/presidecore/datatables.resize.fix.js
@@ -6,9 +6,12 @@
 	tableNeedsResizing = function( $tbl ){
 		var prevParentWidth    = $tbl.data( "_previousParentWidth" )
 		  , currentParentWidth = $tbl.parent().width()
-		  , needsResizing      = typeof prevParentWidth === "undefined" || prevParentWidth !== currentParentWidth;
+		  , needsResizing      = $tbl.DataTable().fnIsOpen() && typeof prevParentWidth === "undefined" || prevParentWidth !== currentParentWidth;
 
 		if ( needsResizing ) {
+			if ( typeof prevParentWidth === "undefined" ) {
+				needsResizing = false;
+			}
 			$tbl.data( "_previousParentWidth", currentParentWidth );
 		}
 
@@ -28,7 +31,6 @@
 		} );
 	};
 
-
 	setInterval( function(){ updateTableSizes(); }, 250 )
 
 } )( presideJQuery );
diff --git a/system/assets/js/admin/specific/datamanager/object/listingTable.js b/system/assets/js/admin/specific/datamanager/object/listingTable.js
@@ -107,7 +107,7 @@
 				}
 
 				if ( allowFilter ) {
-					sDom = "<'well'fr<'clearfix'>><'dataTables_pagination top'<'pull-left'i><'pull-left'l><'pull-right'p>>t<'dataTables_pagination bottom'<'pull-left'i><'pull-left'l><'pull-right'p>><'clearfix'>";
+					sDom = "<'well'fr<'clearfix'>><'dataTables_pagination top'<'pull-left'i><'pull-left'l><'pull-right'p>><'datatable-container't><'dataTables_pagination bottom'<'pull-left'i><'pull-left'l><'pull-right'p>><'clearfix'>";
 				} else {
 					sDom = "fr<'dataTables_pagination top'<'pull-left'i><'pull-left'l><'pull-right'p>>t<'dataTables_pagination bottom'<'pull-left'i><'pull-left'l><'pull-right'p><'clearfix'>";
 				}
@@ -119,6 +119,7 @@
 					bProcessing   : true,
 					bStateSave    : true,
 					bFilter       : allowSearch,
+					iDeferLoading : 0,
 					bAutoWidth    : false,
 					aLengthMenu   : [ 5, 10, 25, 50, 100 ],
 					sDom          : sDom,
@@ -161,6 +162,8 @@
 						if ( allowDataExport ) {
 							setupDataExport( settings );
 						}
+
+						this.fnDraw();
 					},
 					oLanguage : {
 						oAria : {
@@ -207,6 +210,12 @@
 						}
 
 						return sName + "="+JSON.stringify(oData)+"; expires=" + sExpires +"; path=" + sPath;
+					},
+					fnPreDrawCallback : function() {
+						$( ".datatable-container" ).presideLoadingSheen( true );
+					},
+					fnDrawCallback : function() {
+						$( ".datatable-container" ).presideLoadingSheen( false );
 					}
 				} ).fnSetFilteringDelay( searchDelay );
 			};

diff --git a/system/handlers/admin/DataManager.cfc b/system/handlers/admin/DataManager.cfc
@@ -1358,14 +1358,14 @@
 		<cfargument name="useMultiActions"     type="boolean" required="false" default="true" />
 		<cfargument name="isMultilingual"      type="boolean" required="false" default="false" />
 		<cfargument name="draftsEnabled"       type="boolean" required="false" default="false" />
-		<cfargument name="extraFilters"        type="array"   required="false" />
-		<cfargument name="searchFields"        type="array"   required="false" />
+		<cfargument name="extraFilters"        type="array"   required="false" default="#ArrayNew()#" />
+		<cfargument name="searchFields"        type="array"   required="false" default="#ArrayNew()#" />
 
 		<cfscript>
 			gridFields = ListToArray( gridFields );
 
 			var objectTitleSingular = translateResource( uri="preside-objects.#object#:title.singular", defaultValue=object );
-			var getRecordsArgs = Duplicate( arguments );
+			var getRecordsArgs      = Duplicate( arguments );
 			var checkboxCol         = [];
 			var optionsCol          = [];
 			var statusCol           = [];
@@ -1389,27 +1389,31 @@
 			getRecordsArgs.delete( "draftsEnabled"   );
 			getRecordsArgs.delete( "object"   );
 
-			try {
-				getRecordsArgs.extraFilters.append( rulesEngineFilterService.prepareFilter(
-					  objectName = object
-					, expressionArray = DeSerializeJson( rc.sFilterExpression ?: "" )
-				) );
-			} catch( any e ){}
-
-			var savedFilters = presideObjectService.selectData(
-				  objectName   = "rules_engine_condition"
-				, selectFields = [ "expressions" ]
-				, filter       = { id=ListToArray( rc.sSavedFilterExpressions ?: "" ) }
-			);
-			for( var filter in savedFilters ) {
+			if ( Len( Trim( rc.sFilterExpression ?: "" ) ) ) {
 				try {
 					getRecordsArgs.extraFilters.append( rulesEngineFilterService.prepareFilter(
-						  objectName      = object
-						, expressionArray = DeSerializeJson( filter.expressions )
+						  objectName = object
+						, expressionArray = DeSerializeJson( rc.sFilterExpression ?: "" )
 					) );
 				} catch( any e ){}
 			}
 
+			if ( Len( Trim( rc.sSavedFilterExpressions ?: "" ) ) ) {
+				var savedFilters = presideObjectService.selectData(
+					  objectName   = "rules_engine_condition"
+					, selectFields = [ "expressions" ]
+					, filter       = { id=ListToArray( rc.sSavedFilterExpressions ?: "" ) }
+				);
+
+				for( var filter in savedFilters ) {
+					try {
+						getRecordsArgs.extraFilters.append( rulesEngineFilterService.prepareFilter(
+							  objectName      = object
+							, expressionArray = DeSerializeJson( filter.expressions )
+						) );
+					} catch( any e ){}
+				}
+			}
 
 
 			if ( IsEmpty( getRecordsArgs.orderBy ) ) {

diff --git a/system/views/admin/datamanager/_multiActions.cfm b/system/views/admin/datamanager/_multiActions.cfm
@@ -0,0 +1,38 @@
+<cfscript>
+	param name="args.objectName"          type="string";
+	param name="args.batchEditableFields" type="array"   default=[];
+
+	objectTitle          = translateResource( uri="preside-objects.#args.objectName#:title", defaultValue=args.objectName );
+	batchEditTitle       = translateResource( uri="cms:datamanager.batchEditSelected.title" );
+	deleteSelected       = translateResource( uri="cms:datamanager.deleteSelected.title" );
+	deleteSelectedPrompt = translateResource( uri="cms:datamanager.deleteSelected.prompt", data=[ objectTitle ] );
+</cfscript>
+<cfoutput>
+	<cfif args.batchEditableFields.len()>
+		<div class="btn-group batch-update-menu">
+			<button data-toggle="dropdown" class="btn btn-info">
+				<span class="fa fa-caret-down"></span>
+				<i class="fa fa-pencil"></i>
+				#batchEditTitle#
+			</button>
+
+			<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+				<li><h5 class="instructions">#translateResource( uri="cms:datamanager.batchedit.choose.field")#</h5></li>
+				<cfloop array="#args.batchEditableFields#" index="i" item="field">
+					<li data-field="#HtmlEditFormat( field )#" class="field">
+						<a href="##">
+							<i class="fa fa-fw fa-pencil"></i>&nbsp;
+							#translateResource( uri="preside-objects.#args.objectName#:field.#field#.title", defaultValue=field )#
+						</a>
+					</li>
+				</cfloop>
+			</ul>
+		</div>
+	</cfif>
+	<cfif hasCmsPermission( permissionKey="datamanager.delete", context="datamanager", contextKeys=[ args.objectName ] )>
+		<button class="btn btn-danger confirmation-prompt" type="submit" name="delete" disabled="disabled" data-global-key="d" title="#deleteSelectedPrompt#">
+			<i class="fa fa-trash-o bigger-110"></i>
+			#deleteSelected#
+		</button>
+	</cfif>
+</cfoutput>
diff --git a/system/views/admin/datamanager/_objectDataTable.cfm b/system/views/admin/datamanager/_objectDataTable.cfm
@@ -1,9 +1,10 @@
 <cfscript>
 	param name="args.objectName"          type="string";
 	param name="args.useMultiActions"     type="boolean" default=false;
+	param name="args.multiActionViewlet"  type="string"  default="admin.datamanager._multiActions";
+	param name="args.multiActionUrl"      type="string"  default="";
 	param name="args.isMultilingual"      type="boolean" default=false;
 	param name="args.draftsEnabled"       type="boolean" default=false;
-	param name="args.multiActionUrl"      type="string"  default="";
 	param name="args.gridFields"          type="array";
 	param name="args.filterContextData"   type="struct"  default={};
 	param name="args.allowSearch"         type="boolean" default=true;
@@ -159,33 +160,7 @@
 		</table>
 		<cfif args.useMultiActions>
 				<div class="form-actions" id="multi-action-buttons">
-					<cfif args.batchEditableFields.len()>
-						<div class="btn-group batch-update-menu">
-							<button data-toggle="dropdown" class="btn btn-info">
-								<span class="fa fa-caret-down"></span>
-								<i class="fa fa-pencil"></i>
-								#batchEditTitle#
-							</button>
-
-							<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-								<li><h5 class="instructions">#translateResource( uri="cms:datamanager.batchedit.choose.field")#</h5></li>
-								<cfloop array="#args.batchEditableFields#" index="i" item="field">
-									<li data-field="#HtmlEditFormat( field )#" class="field">
-										<a href="##">
-											<i class="fa fa-fw fa-pencil"></i>&nbsp;
-											#translateResource( uri="preside-objects.#args.objectName#:field.#field#.title", defaultValue=field )#
-										</a>
-									</li>
-								</cfloop>
-							</ul>
-						</div>
-					</cfif>
-					<cfif hasCmsPermission( permissionKey="datamanager.delete", context="datamanager", contextKeys=[ args.objectName ] )>
-						<button class="btn btn-danger confirmation-prompt" type="submit" name="delete" disabled="disabled" data-global-key="d" title="#deleteSelectedPrompt#">
-							<i class="fa fa-trash-o bigger-110"></i>
-							#deleteSelected#
-						</button>
-					</cfif>
+					#renderViewlet( event=args.multiActionViewlet, args=args )#
 				</div>
 			</form>
 		</cfif>