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

2016-08-14 17:13:20 +02:00
parent 5df5fa8480
commit d54f160d6a
2 changed files with 7 additions and 3 deletions
@@ -12,8 +12,8 @@ use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Modules\Categories\Entities\Category;
+use Pingpong\Modules\Facades\Module as ModuleInstance;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
 class CreateNewContent extends Controller
 {
    /**
@@ -47,10 +47,11 @@ class CreateNewContent extends Controller
        $templates = Template::where('module_id', $moduleId)
                             ->select(['template_name', 'name', 'description'])
                             ->get();
+        $categoryModule = ModuleInstance::get('categories');

        // add categories, if supported
        $categories = [];
-        if ($module->support_categories) {
+        if ($module->support_categories && $categoryModule->enabled()) {
            $categories = Category::where('module_id', $moduleId)
                                  ->get();
        }