mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

All DateTime fields now validated in Lists

Browse Source
This commit is contained in:
Sam Georges 2014-06-20 19:30:37 +10:00
parent d2eb4e2141
commit 433cf85bd4
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/backend/widgets/Lists.php
View File

@ -608,6 +608,8 @@ class Lists extends WidgetBase
if ($value === null) if ($value === null)
return null; return null;
$value = $this->validateDateTimeValue($value, $column);
if ($column->format !== null) if ($column->format !== null)
return $value->format($column->format); return $value->format($column->format);
@ -622,6 +624,8 @@ class Lists extends WidgetBase
if ($value === null) if ($value === null)
return null; return null;
$value = $this->validateDateTimeValue($value, $column);
if ($column->format === null) if ($column->format === null)
$column->format = 'g:i A'; $column->format = 'g:i A';
@ -636,6 +640,8 @@ class Lists extends WidgetBase
if ($value === null) if ($value === null)
return null; return null;
$value = $this->validateDateTimeValue($value, $column);
if ($column->format !== null) if ($column->format !== null)
return $value->format($column->format); return $value->format($column->format);
@ -650,13 +656,23 @@ class Lists extends WidgetBase
if ($value === null) if ($value === null)
return null; return null;
$value = $this->validateDateTimeValue($value, $column);
return $value->diffForHumans();
}
/**
* Validates a column type as a date
*/
private function validateDateTimeValue($value, $column)
{
if ($value instanceof DateTime) if ($value instanceof DateTime)
$value = Carbon::instance($value); $value = Carbon::instance($value);
if (!$value instanceof Carbon) if (!$value instanceof Carbon)
throw new ApplicationException(sprintf('Column value %s is not a DateTime object, are you missing a $dates reference in the Model?', $column->columnName)); throw new ApplicationException(Lang::get('backend::lang.list.invalid_column_datetime', ['column' => $column->columnName]));
return $value->diffForHumans(); return $value;
} }
// //