FIX: fixing some missing translations and other minor bugs
This commit is contained in:
@@ -34,6 +34,9 @@ class History implements HistoryHandler
|
||||
'to' => $statuses[$changeset->new_value]
|
||||
]);
|
||||
break;
|
||||
case 'is_homepage':
|
||||
return trans('admin/history.setupAsHomepage');
|
||||
break;
|
||||
default:
|
||||
return trans('admin/history.changedFromTo', [
|
||||
'from' => $changeset->old_value,
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\ActiveContentStatuses;
|
||||
use App\Http\Requests\CreateNewContentRequest;
|
||||
use App\Models\Content;
|
||||
use App\Models\Module;
|
||||
use App\Models\Template;
|
||||
@@ -48,8 +49,7 @@ class CreateNewContent extends Controller
|
||||
/**
|
||||
* Save new content page
|
||||
*
|
||||
* @param CreateNewStaticPageRequest $request
|
||||
*
|
||||
* @param CreateNewContentRequest $request
|
||||
* @param $moduleId
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
@@ -72,8 +72,8 @@ class CreateNewContent extends Controller
|
||||
$page->url = Str::slug($request->url);
|
||||
$page->published_from = $request->publishedFrom;
|
||||
$page->published_to = $request->publishedTo;
|
||||
$page->meta_keywords = $request->meta_description;
|
||||
$page->meta_description = $request->meta_description;
|
||||
$page->meta_keywords = $request->metaDescription;
|
||||
$page->meta_description = $request->metaDescription;
|
||||
$page->content = $request->pageContent;
|
||||
$page->status = $request->status;
|
||||
$page->template = $request->template;
|
||||
|
||||
@@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Enumerations\ContentStatuses;
|
||||
use App\Enumerations\ModulesHandlerToId;
|
||||
use App\Http\Requests\EditContentRequest;
|
||||
use App\Models\Content;
|
||||
use App\Models\ContentHistory;
|
||||
use App\Models\Template;
|
||||
@@ -53,24 +54,24 @@ class EditContent extends Controller
|
||||
|
||||
// render view
|
||||
return view('admin.content.edit', [
|
||||
'contentStatuses' => $statuses,
|
||||
'page' => $page,
|
||||
'templates' => $templates,
|
||||
'contentStatuses' => $statuses,
|
||||
'page' => $page,
|
||||
'templates' => $templates,
|
||||
'formSectionNames' => call_user_func([$page->module_handler, 'getExtendedFormSections']),
|
||||
'formSections' => call_user_func([$page->module_handler, 'getExtendedFormInputsCreate']),
|
||||
'historySize' => count($history['changesets'])
|
||||
'historySize' => count($history['changesets'])
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Edit static page and save changes into history.
|
||||
*
|
||||
* @param EditStaticPageRequest $request
|
||||
* @param EditContentRequest $request
|
||||
* @param $id
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function postEdit(EditStaticPageRequest $request, $id)
|
||||
public function postEdit(EditContentRequest $request, $id)
|
||||
{
|
||||
try {
|
||||
$page = Content::findOrFail($id);
|
||||
@@ -230,7 +231,6 @@ class EditContent extends Controller
|
||||
* @var $page Content
|
||||
*/
|
||||
$page = Content::findOrFail($id);
|
||||
$homepage = $page->getHomepage();
|
||||
} catch (NotFoundHttpException $e) {
|
||||
// page not found
|
||||
return redirect()
|
||||
@@ -238,12 +238,12 @@ class EditContent extends Controller
|
||||
->with('error', trans('admin/contents.invalidPage'));
|
||||
}
|
||||
|
||||
// disable any other existing homepage
|
||||
Content::where('is_homepage', 1)
|
||||
->update(['is_homepage' => 0]);
|
||||
|
||||
|
||||
list ($revision, $changedColumns) = $page->updateWithHistory(['is_homepage' => 'is_homepage'], ['is_homepage' => 1]);
|
||||
|
||||
if ($homepage)
|
||||
$homepage->updateWithHistory(['isHomepage' => 'is_homepage'], ['ishomepage' => 0]);
|
||||
// set new homepage
|
||||
list (, $changedColumns) = $page->updateWithHistory(['is_homepage' => 'is_homepage'], ['is_homepage' => 1]);
|
||||
|
||||
// was something changed?
|
||||
if ($changedColumns == 0) {
|
||||
|
||||
Reference in New Issue
Block a user