@@ -64,10 +64,11 @@ |
||
| 64 | 64 | $itemGenerator = new $generator($module); |
| 65 | 65 | $returnedFiles = $itemGenerator->generate(); |
| 66 | 66 | |
| 67 | - if (!is_array($returnedFiles)) |
|
| 68 | - $generatedFiles[] = $returnedFiles; |
|
| 69 | - else |
|
| 70 | - $generatedFiles = array_merge($generatedFiles, $returnedFiles); |
|
| 67 | + if (!is_array($returnedFiles)) { |
|
| 68 | + $generatedFiles[] = $returnedFiles; |
|
| 69 | + } else { |
|
| 70 | + $generatedFiles = array_merge($generatedFiles, $returnedFiles); |
|
| 71 | + } |
|
| 71 | 72 | |
| 72 | 73 | $bar->advance(); |
| 73 | 74 | } |
@@ -51,14 +51,14 @@ |
||
| 51 | 51 | $this->insertIntoFile( |
| 52 | 52 | $mainMenuFile, |
| 53 | 53 | '{{-- Main Menu --}}', |
| 54 | - "\n".'<li class="nav-item dropdown"> |
|
| 54 | + "\n".'<li class="nav-item dropdown"> |
|
| 55 | 55 | <a href="#" class="nav-link has-dropdown" data-toggle="dropdown"><i class="fas fa-columns"></i> <span> '.Str::plural($this->module->getModelName()).' </span></a> |
| 56 | 56 | <ul class="dropdown-menu"> |
| 57 | 57 | <li><a class="nav-link" href="{{ route("backend.'.$this->module->getModuleName().'.create") }}"> Add new '.Str::plural($this->module->getModelName()).'</a></li> |
| 58 | 58 | <li><a class="nav-link" href="{{ route("backend.'.$this->module->getModuleName().'.index") }}">All '.Str::plural($this->module->getModelName()).'</a></li> |
| 59 | 59 | </ul> |
| 60 | 60 | </li>' |
| 61 | - ); |
|
| 61 | + ); |
|
| 62 | 62 | return $this->generatedFiles; |
| 63 | 63 | } |
| 64 | 64 | |
@@ -146,7 +146,9 @@ |
||
| 146 | 146 | $foreignData = ""; |
| 147 | 147 | |
| 148 | 148 | foreach ($types as $type) { |
| 149 | - if ($type->hasSelfParent()) continue; |
|
| 149 | + if ($type->hasSelfParent()) { |
|
| 150 | + continue; |
|
| 151 | + } |
|
| 150 | 152 | $foreignData .= $this->buildTemplate('common/Factories/fragments/options', [ |
| 151 | 153 | '{{parent}}' => $type->getColumnKey(), |
| 152 | 154 | '{{parentModel}}' => $type->getRelatedModel() |
@@ -4,9 +4,9 @@ |
||
| 4 | 4 | use Illuminate\Support\Str; |
| 5 | 5 | use Prateekkarki\Laragen\Models\TypeResolver; |
| 6 | 6 | |
| 7 | - /** |
|
| 8 | - * @method integer getSize() |
|
| 9 | - */ |
|
| 7 | + /** |
|
| 8 | + * @method integer getSize() |
|
| 9 | + */ |
|
| 10 | 10 | abstract class LaragenType |
| 11 | 11 | { |
| 12 | 12 | protected $uniqueFlag; |
@@ -45,10 +45,11 @@ |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function getModule($name) { |
| 48 | - if(isset($this->modules[$name])) |
|
| 49 | - return $this->modules[$name]; |
|
| 50 | - else |
|
| 51 | - throw new \Exception("Module '". $name. "' not found"); |
|
| 48 | + if(isset($this->modules[$name])) { |
|
| 49 | + return $this->modules[$name]; |
|
| 50 | + } else { |
|
| 51 | + throw new \Exception("Module '". $name. "' not found"); |
|
| 52 | + } |
|
| 52 | 53 | } |
| 53 | 54 | |
| 54 | 55 | protected function getModulesRecursive($moduleName, $moduleData) { |
@@ -44,8 +44,9 @@ |
||
| 44 | 44 | $data = new TypeResolver($this->name, $column, $typeOptions); |
| 45 | 45 | $type = $data->getLaragenType(); |
| 46 | 46 | $this->columnsData[$column] = $type; |
| 47 | - if ($type->isDisplay()) |
|
| 48 | - $this->displayColumns[] = $type; |
|
| 47 | + if ($type->isDisplay()) { |
|
| 48 | + $this->displayColumns[] = $type; |
|
| 49 | + } |
|
| 49 | 50 | } |
| 50 | 51 | |
| 51 | 52 | if (sizeof($this->displayColumns) == 0) { |
@@ -13,8 +13,9 @@ discard block |
||
| 13 | 13 | public function __construct() |
| 14 | 14 | { |
| 15 | 15 | $this->middleware(function($request, $next) { |
| 16 | - if (!auth()->user()->getRoleNames()->contains('super-admin')) |
|
| 17 | - abort(403, 'Access denied'); |
|
| 16 | + if (!auth()->user()->getRoleNames()->contains('super-admin')) { |
|
| 17 | + abort(403, 'Access denied'); |
|
| 18 | + } |
|
| 18 | 19 | return $next($request); |
| 19 | 20 | }); |
| 20 | 21 | |
@@ -44,8 +45,9 @@ discard block |
||
| 44 | 45 | return $perm; |
| 45 | 46 | })->groupBy(function($perm) { |
| 46 | 47 | foreach (array_keys(app('laragen')->getModules()) as $module) { |
| 47 | - if (Str::contains($perm->name, str_replace('_', ' ', $module))) |
|
| 48 | - return Str::title(str_replace('_', ' ', $module)); |
|
| 48 | + if (Str::contains($perm->name, str_replace('_', ' ', $module))) { |
|
| 49 | + return Str::title(str_replace('_', ' ', $module)); |
|
| 50 | + } |
|
| 49 | 51 | } |
| 50 | 52 | return "Others"; |
| 51 | 53 | }), |
@@ -63,8 +65,9 @@ discard block |
||
| 63 | 65 | return $perm; |
| 64 | 66 | })->groupBy(function($perm) { |
| 65 | 67 | foreach (array_keys(app('laragen')->getModules()) as $module) { |
| 66 | - if (Str::contains($perm->name, str_replace('_', ' ', $module))) |
|
| 67 | - return Str::title(str_replace('_', ' ', $module)); |
|
| 68 | + if (Str::contains($perm->name, str_replace('_', ' ', $module))) { |
|
| 69 | + return Str::title(str_replace('_', ' ', $module)); |
|
| 70 | + } |
|
| 68 | 71 | } |
| 69 | 72 | return "Others"; |
| 70 | 73 | }), |