TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various fixes to datepicker and form widget

This commit is contained in:
Samuel Georges 2014-11-27 19:02:23 +11:00
parent f0cb98e63c
commit 3dbe487698
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/backend/classes/FormWidgetBase.php
View File

@ -110,7 +110,12 @@ abstract class FormWidgetBase extends WidgetBase
public function getLoadData()
{
list($model, $attribute) = $this->getModelArrayAttribute($this->valueFrom);
return $model->{$attribute};
if (!is_null($model)) {
return $model->{$attribute};
}
return null;
}
/**

8
modules/backend/formwidgets/DatePicker.php
View File

@ -60,6 +60,7 @@ class DatePicker extends FormWidgetBase
$this->vars['name'] = $this->formField->getName();
$this->vars['timeName'] = self::TIME_PREFIX.$this->formField->getName(false);
$this->vars['timeValue'] = null;
if ($value = $this->getLoadData()) {
@ -67,12 +68,11 @@ class DatePicker extends FormWidgetBase
* Date / Time
*/
if ($this->mode == 'datetime') {
if (is_string($value)) {
$dateTime = explode(' ', $value);
}
elseif (is_object($value)) {
if (is_object($value)) {
$value = $value->toDateTimeString();
}
$dateTime = explode(' ', $value);
$value = $dateTime[0];
$this->vars['timeValue'] = isset($dateTime[1]) ? substr($dateTime[1], 0, 5) : '';
}