minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REFACTORING: another ugly commit full of refactored code

Browse Source
This commit is contained in:
Michal Kváček
2016-10-19 00:28:44 +02:00
parent 4f6a006ad9
commit 28f67ffe3c
34 changed files with 101 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/Contents/EditContent.php
+9 -16
View File
@@ -1,6 +1,9 @@
<?php
namespace App\Http\Controllers\Admin\Contents;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate;
use App\CMS\Enumerations\ContentStatuses;
use App\Cms\Handlers\Interactions\Interaction;
use App\CMS\Helpers\CurrentTemplate;
@@ -12,16 +15,9 @@ use App\Http\Requests\Request;
use App\Models\Content\Content;
use App\Models\Content\ContentHistory;
use App\Models\FileManager\File;
use App\Models\Module;
use App\Models\Templates\Template;
use Illuminate\Support\Facades\Event;
use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate;
use Modules\Categories\Contracts\Repositories\Category as ICategory;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class EditContent extends Controller
{
@@ -85,15 +81,12 @@ class EditContent extends Controller
$page = $this->content->getOne($url);
// get module ID
$module = Module::where('handler', $page->module_handler)
->firstOrFail();
$pageHeading = $this->module->getUpdateContentTitle($module);
$module = $this->module->getByHandler($page->module_handler);
$pageHeading = $this->module->getUpdateContentTitle($module, $page);
$templates = $this->template->getForModule($module);
$categories = $this->category->getForModule($module);
$history = $this->history->getStructuredHistoryOf($page);
// modify data for edit form according to installed template
call_user_func_array([CurrentTemplate::handler(), 'beforePopulatingEditForm'], [&$page]);
@@ -106,8 +99,8 @@ class EditContent extends Controller
'categories' => $categories,
'rootPages' => $this->content->getOverview(),
'templates' => $templates,
'formSectionNames' => call_user_func([$page->module_handler, 'getExtendedFormSections']),
'formSections' => call_user_func([$page->module_handler, 'getExtendedFormInputsEdit']),
'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
'formSections' => $this->module->call($module, 'getExtendedFormInputsEdit'),
'historySize' => count($history['changesets'])
]);
}
@@ -126,7 +119,7 @@ class EditContent extends Controller
/**
* @var $page Content
*/
$page = Content::findOrFail($id);
$page = $this->content->getOne($id);
} catch (NotFoundHttpException $e) {
// log attempt of invalid edit
app/Http/Controllers/Admin/Contents/History.php
-1
View File
@@ -43,7 +43,6 @@ class History extends Controller
return view('admin/history.diff', [
'change' => $change,
'columnName' => 'Page content',
'diff' => $diff
]);
}