|  |  |  | @ -299,6 +299,11 @@ | 
			
		
	
		
			
				
					|  |  |  |  |                     column.targets = i; | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |                 if (!column.render && column.dataFormat){ | 
			
		
	
		
			
				
					|  |  |  |  |                     var render = datatables.defaultRenderers[column.dataFormat]; | 
			
		
	
		
			
				
					|  |  |  |  |                     column.render = render ? render : ISOStringToDateTimeLocaleString(column.dataFormat); | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |                 if (column.rowAction) { | 
			
		
	
		
			
				
					|  |  |  |  |                     customizeRowActionColumn(column); | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
	
		
			
				
					|  |  |  | @ -330,18 +335,23 @@ | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  |     }; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     var ISOStringToDateTimeLocaleString = function (format) { | 
			
		
	
		
			
				
					|  |  |  |  |         return function(data) { | 
			
		
	
		
			
				
					|  |  |  |  |             var date = luxon | 
			
		
	
		
			
				
					|  |  |  |  |                 .DateTime | 
			
		
	
		
			
				
					|  |  |  |  |                 .fromISO(data, { | 
			
		
	
		
			
				
					|  |  |  |  |                     locale: abp.localization.currentCulture.name | 
			
		
	
		
			
				
					|  |  |  |  |                 }); | 
			
		
	
		
			
				
					|  |  |  |  |             return format ? date.toLocaleString(format) : date.toLocaleString(); | 
			
		
	
		
			
				
					|  |  |  |  |         }; | 
			
		
	
		
			
				
					|  |  |  |  |     }; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     datatables.defaultRenderers['date'] = function (value) { | 
			
		
	
		
			
				
					|  |  |  |  |         return luxon | 
			
		
	
		
			
				
					|  |  |  |  |             .DateTime | 
			
		
	
		
			
				
					|  |  |  |  |             .fromISO(value, { locale: abp.localization.currentCulture.name }) | 
			
		
	
		
			
				
					|  |  |  |  |             .toLocaleString(); | 
			
		
	
		
			
				
					|  |  |  |  |         return (ISOStringToDateTimeLocaleString())(value); | 
			
		
	
		
			
				
					|  |  |  |  |     }; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     datatables.defaultRenderers['datetime'] = function (value) { | 
			
		
	
		
			
				
					|  |  |  |  |         return luxon | 
			
		
	
		
			
				
					|  |  |  |  |             .DateTime | 
			
		
	
		
			
				
					|  |  |  |  |             .fromISO(value, { locale: abp.localization.currentCulture.name }) | 
			
		
	
		
			
				
					|  |  |  |  |             .toLocaleString(luxon.DateTime.DATETIME_SHORT); | 
			
		
	
		
			
				
					|  |  |  |  |         return (ISOStringToDateTimeLocaleString(luxon.DateTime.DATETIME_SHORT))(value); | 
			
		
	
		
			
				
					|  |  |  |  |     }; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     /************************************************************************ | 
			
		
	
	
		
			
				
					|  |  |  | 
 |