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

FIX: fix showing/hiding categories when categories module is not enabled

Browse Source
This commit is contained in:
Michal Kváček
2016-08-14 17:13:20 +02:00
parent 5df5fa8480
commit d54f160d6a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/CreateNewContent.php
+3 -2
View File
@@ -12,8 +12,8 @@ use Illuminate\Support\Facades\Event;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization; use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
use Modules\Categories\Entities\Category; use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class CreateNewContent extends Controller class CreateNewContent extends Controller
{ {
/** /**
@@ -47,10 +47,11 @@ class CreateNewContent extends Controller
$templates = Template::where('module_id', $moduleId) $templates = Template::where('module_id', $moduleId)
->select(['template_name', 'name', 'description']) ->select(['template_name', 'name', 'description'])
->get(); ->get();
$categoryModule = ModuleInstance::get('categories');
// add categories, if supported // add categories, if supported
$categories = []; $categories = [];
if ($module->support_categories) { if ($module->support_categories && $categoryModule->enabled()) {
$categories = Category::where('module_id', $moduleId) $categories = Category::where('module_id', $moduleId)
->get(); ->get();
} }
app/Http/Controllers/Admin/EditContent.php
+4 -1
View File
@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Event;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization; use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
use Modules\Categories\Entities\Category; use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class EditContent extends Controller class EditContent extends Controller
@@ -63,9 +64,11 @@ class EditContent extends Controller
->select(['template_name', 'name', 'description']) ->select(['template_name', 'name', 'description'])
->get(); ->get();
$categoryModule = ModuleInstance::get('categories');
// add categories, if supported // add categories, if supported
$categories = []; $categories = [];
if ($module->support_categories) { if ($module->support_categories && $categoryModule->enabled()) {
$categories = Category::where('module_id', $moduleId) $categories = Category::where('module_id', $moduleId)
->get(); ->get();
} }