FEATURE #1374: add logging for static pages
This commit is contained in:
@@ -14,6 +14,7 @@ class ActionLogType extends Model
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'string_id',
|
||||
'value'
|
||||
];
|
||||
|
||||
|
||||
+14
-10
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Http\Requests\Request;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
@@ -59,21 +58,26 @@ class Content extends Model
|
||||
/**
|
||||
* Updates current model with information about changed columns
|
||||
*
|
||||
* @param array $fields
|
||||
* @param Request $request
|
||||
* @param array $fields
|
||||
* @param array $request
|
||||
*
|
||||
* @return int number of changed columns
|
||||
*/
|
||||
public function updateWithHistory(array $fields, Request $request)
|
||||
public function updateWithHistory(array $fields, array $request)
|
||||
{
|
||||
$editBatch = uniqid();
|
||||
$changed = 0;
|
||||
|
||||
foreach ($fields as $fieldDB => $fieldRequest) {
|
||||
// remove any whitespaces around real content
|
||||
$request->$fieldRequest = trim($request->$fieldRequest);
|
||||
// ignore non-existing fields
|
||||
if (!isset($this->$fieldDB) || !isset($request[$fieldRequest])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($this->$fieldDB != $request->$fieldRequest) {
|
||||
// remove any whitespaces around real content
|
||||
$request[$fieldRequest] = trim($request[$fieldRequest]);
|
||||
|
||||
if ($this->$fieldDB != $request[$fieldRequest]) {
|
||||
|
||||
// setup history object
|
||||
$history = [
|
||||
@@ -82,14 +86,14 @@ class Content extends Model
|
||||
'edit_batch' => $editBatch,
|
||||
'column' => $fieldRequest,
|
||||
'old_value' => $this->$fieldDB,
|
||||
'new_value' => $request->$fieldRequest
|
||||
'new_value' => $request[$fieldRequest]
|
||||
];
|
||||
|
||||
// save history
|
||||
ContentHistory::create($history);
|
||||
|
||||
// save change into database
|
||||
$this->$fieldDB = $request->$fieldRequest;
|
||||
$this->$fieldDB = $request[$fieldRequest];
|
||||
|
||||
$changed++;
|
||||
}
|
||||
@@ -97,7 +101,7 @@ class Content extends Model
|
||||
|
||||
$this->save();
|
||||
|
||||
return $changed;
|
||||
return [$editBatch, $changed];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user