FIX: fix history handling - null values were not updated

This commit is contained in:
Michal Kváček
2016-03-31 21:11:51 +02:00
parent 5045dca3d4
commit acc7541ab9
3 changed files with 6 additions and 4 deletions
+2 -2
View File
@@ -39,8 +39,8 @@ class History implements HistoryHandler
break; break;
default: default:
return trans('admin/history.changedFromTo', [ return trans('admin/history.changedFromTo', [
'from' => $changeset->old_value, 'from' => is_null($changeset->old_value) ? trans('admin/history.emptyValue') : $changeset->old_value,
'to' => $changeset->new_value 'to' => is_null($changeset->new_value) ? trans('admin/history.emptyValue') : $changeset->new_value,
]); ]);
break; break;
} }
+3 -2
View File
@@ -125,14 +125,15 @@ class Content extends Model
foreach ($fields as $fieldDB => $fieldRequest) { foreach ($fields as $fieldDB => $fieldRequest) {
// ignore non-existing fields // ignore non-existing fields
if (!isset($this->$fieldDB) || !isset($request[$fieldRequest])) { if ((!isset($this->$fieldDB) && !is_null($this->$fieldDB)) || (!isset($request[$fieldRequest]) && !is_null($request[$fieldRequest]))) {
continue; continue;
} }
// remove any whitespaces around real content // remove any whitespaces around real content
if (!is_null($request[$fieldRequest]))
$request[$fieldRequest] = trim($request[$fieldRequest]); $request[$fieldRequest] = trim($request[$fieldRequest]);
if ($this->$fieldDB != $request[$fieldRequest]) { if (trim($this->$fieldDB) != $request[$fieldRequest]) {
// setup history object // setup history object
$history = [ $history = [
+1
View File
@@ -9,6 +9,7 @@ return [
'columnStatus' => 'Page visibility', 'columnStatus' => 'Page visibility',
'columnTemplate' => 'Template', 'columnTemplate' => 'Template',
'columnIs_homepage' => 'Homepage', 'columnIs_homepage' => 'Homepage',
'emptyValue' => '<em>none</em>',
'changedFromTo' => 'Changed from <del>:from</del> to <ins>:to</ins>', 'changedFromTo' => 'Changed from <del>:from</del> to <ins>:to</ins>',
'numOfChanges' => 'One change|:count changes', 'numOfChanges' => 'One change|:count changes',
'diff' => 'Difference', 'diff' => 'Difference',