Fixed bug with wrong date format

sleeping-owl · Oct 20, 2014 · c88b2c0 · c88b2c0
1 parent 5bca6c3
commit c88b2c0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/src/SleepingOwl/Admin/Models/Form/FormItem/Date.php b/src/SleepingOwl/Admin/Models/Form/FormItem/Date.php
@@ -8,4 +8,11 @@ public function render()
 			'data-date-picktime' => false
 		]);
 	}
+
+	public function getValidationRules()
+	{
+		$rules = parent::getValidationRules();
+		$rules[] = 'date';
+		return $rules;
+	}
 } 
diff --git a/src/SleepingOwl/Admin/Models/Form/FormItem/Timestamp.php b/src/SleepingOwl/Admin/Models/Form/FormItem/Timestamp.php
@@ -13,4 +13,12 @@ public function render()
 			'data-date-useseconds' => $this->showSeconds,
 		], DateFormatter::SHORT, $this->showSeconds ? DateFormatter::MEDIUM : DateFormatter::SHORT);
 	}
+
+	public function getValidationRules()
+	{
+		$rules = parent::getValidationRules();
+		$rules[] = 'date';
+		return $rules;
+	}
+
 }
diff --git a/src/SleepingOwl/DateFormatter/DateFormatter.php b/src/SleepingOwl/DateFormatter/DateFormatter.php
@@ -15,7 +15,13 @@ public static function format($date, $dateFormat = self::SHORT, $timeFormat = se
 	{
 		if ( ! $date instanceof Carbon)
 		{
-			$date = new Carbon($date);
+			try
+			{
+				$date = new Carbon($date);
+			} catch (\Exception $e)
+			{
+				return null;
+			}
 		}
 		if ( ! function_exists('datefmt_create'))
 		{

diff --git a/src/SleepingOwl/Models/SleepingOwlModel.php b/src/SleepingOwl/Models/SleepingOwlModel.php
@@ -62,8 +62,9 @@ public function fromDateTime($value)
 			$result = parent::fromDateTime($value);
 		} catch (InvalidArgumentException $e)
 		{
+			$value = strtotime($value);
 			$format = $this->getDateFormat();
-			$value = new Carbon($value);
+			$value = Carbon::createFromTimestamp($value);
 			return $value->format($format);
 		}
 		return $result;