@@ -270,13 +270,13 @@ |
||
270 | 270 | $domain = $this->domain; |
271 | 271 | $module = $this->module; |
272 | 272 | |
273 | - // Get model model class |
|
274 | - $modelClass = $module->model_class; |
|
273 | + // Get model model class |
|
274 | + $modelClass = $module->model_class; |
|
275 | 275 | |
276 | - // Check if the class exists |
|
277 | - if (!class_exists($modelClass)) { |
|
278 | - return false; |
|
279 | - } |
|
276 | + // Check if the class exists |
|
277 | + if (!class_exists($modelClass)) { |
|
278 | + return false; |
|
279 | + } |
|
280 | 280 | |
281 | 281 | // Filter on domain if column exists |
282 | 282 | if (Schema::hasColumn((new $modelClass)->getTable(), 'domain_id')) { |
@@ -234,8 +234,7 @@ |
||
234 | 234 | // $currentClass = 'class="green-text"'; |
235 | 235 | // } |
236 | 236 | return '<li><a href="'.ucroute('uccello.home', $node).'" '.$currentClass.'>'.$node->name.'</a>{sub-tree}</li>'; |
237 | - } |
|
238 | - elseif (auth()->user()->hasRoleOnDescendantDomain($node)) { |
|
237 | + } elseif (auth()->user()->hasRoleOnDescendantDomain($node)) { |
|
239 | 238 | return '<li>'.$node->name.'{sub-tree}</li>'; |
240 | 239 | } else { |
241 | 240 | return ''; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | protected function getSettingsModule() |
29 | 29 | { |
30 | - return Module::where('name', 'settings')->first(); |
|
30 | + return Module::where('name', 'settings')->first(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function testModuleActivationCanBeChanged() |