FIX: fix saving title photo in content pages
This commit is contained in:
@@ -116,7 +116,9 @@ class CreateNewContent extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// upload file - if provided
|
// upload file - if provided
|
||||||
$page->uploadTitlePhoto($request);
|
$file = $page->uploadTitlePhoto($request);
|
||||||
|
|
||||||
|
$page->title_photo = $file ? $file['filename'] : null;
|
||||||
|
|
||||||
// save module-specific stuff
|
// save module-specific stuff
|
||||||
call_user_func_array([$module->handler, 'createNew'], [&$page, $request]);
|
call_user_func_array([$module->handler, 'createNew'], [&$page, $request]);
|
||||||
|
|||||||
@@ -118,12 +118,14 @@ class EditContent extends Controller
|
|||||||
->with('error', trans('admin/contents.invalidPage'));
|
->with('error', trans('admin/contents.invalidPage'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// upload file - if provided
|
||||||
|
$file = $page->uploadTitlePhoto($request);
|
||||||
|
|
||||||
$request->url = Str::slug($request->url);
|
$request->url = Str::slug($request->url);
|
||||||
$request->parentPage = $request->parentPage ? $request->parentPage : null;
|
$request->parentPage = $request->parentPage ? $request->parentPage : null;
|
||||||
$request->titlePhotoFilename = $page->title_photo;
|
|
||||||
|
|
||||||
// upload file - if provided
|
$request->titlePhotoFilename = $file ? $file['filename'] : null;
|
||||||
$page->uploadTitlePhoto($request);
|
|
||||||
|
|
||||||
// array of fields in database and fields from request
|
// array of fields in database and fields from request
|
||||||
$fields = [
|
$fields = [
|
||||||
@@ -142,7 +144,8 @@ class EditContent extends Controller
|
|||||||
];
|
];
|
||||||
|
|
||||||
// save new values with history
|
// save new values with history
|
||||||
$data = self::getFields($request, $fields);
|
$data = self::getFields($request, array_values($fields));
|
||||||
|
|
||||||
list($revision, $changedColumns) = $page->updateWithHistory($fields, $data);
|
list($revision, $changedColumns) = $page->updateWithHistory($fields, $data);
|
||||||
|
|
||||||
$changedColumns += call_user_func_array([$page->module_handler, 'edit'], [&$page, $request, $revision]);
|
$changedColumns += call_user_func_array([$page->module_handler, 'edit'], [&$page, $request, $revision]);
|
||||||
|
|||||||
@@ -293,10 +293,10 @@ class Content extends Model
|
|||||||
public function uploadTitlePhoto(Request $request)
|
public function uploadTitlePhoto(Request $request)
|
||||||
{
|
{
|
||||||
if ($request->hasFile('titlePhoto')) {
|
if ($request->hasFile('titlePhoto')) {
|
||||||
$file = $this->file->upload($request->file('titlePhoto'), $request);
|
return $this->file->upload($request->file('titlePhoto'), $request);
|
||||||
|
|
||||||
$this->title_photo = $file['filename'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user