@@ -154,7 +154,7 @@ |
||
154 | 154 | |
155 | 155 | // Add tab id if defined |
156 | 156 | if ($this->tab_id) { |
157 | - $params['tab'] = $this->tab_id; |
|
157 | + $params[ 'tab' ] = $this->tab_id; |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | return ucroute('uccello.edit.relation.delete', $domain, $this->relatedModule, $params); |
@@ -60,17 +60,17 @@ |
||
60 | 60 | |
61 | 61 | public function parentGroups() |
62 | 62 | { |
63 | - return $this->belongsToMany(self::class, $this->tablePrefix . 'rl_groups_groups', 'children_id', 'parent_id'); |
|
63 | + return $this->belongsToMany(self::class, $this->tablePrefix.'rl_groups_groups', 'children_id', 'parent_id'); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | public function childrenGroups() |
67 | 67 | { |
68 | - return $this->belongsToMany(self::class, $this->tablePrefix . 'rl_groups_groups', 'parent_id', 'children_id'); |
|
68 | + return $this->belongsToMany(self::class, $this->tablePrefix.'rl_groups_groups', 'parent_id', 'children_id'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | public function users() |
72 | 72 | { |
73 | - return $this->belongsToMany(User::class, $this->tablePrefix . 'rl_groups_users'); |
|
73 | + return $this->belongsToMany(User::class, $this->tablePrefix.'rl_groups_users'); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -24,11 +24,11 @@ |
||
24 | 24 | 'record_id', |
25 | 25 | ]; |
26 | 26 | |
27 | - protected $primaryKey = 'id'; // TODO: Change to "uid" to make joins withs modules tables possible ??? |
|
27 | + protected $primaryKey = 'id'; // TODO: Change to "uid" to make joins withs modules tables possible ??? |
|
28 | 28 | public $incrementing = false; |
29 | 29 | |
30 | 30 | // Allow Eloquent to return id as string instead of int. |
31 | - protected $casts = ['id' => 'string']; |
|
31 | + protected $casts = [ 'id' => 'string' ]; |
|
32 | 32 | |
33 | 33 | protected function initTablePrefix() |
34 | 34 | { |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | { |
20 | 20 | parent::boot(); |
21 | 21 | |
22 | - if(static::isFilteredByUser()) |
|
22 | + if (static::isFilteredByUser()) |
|
23 | 23 | { |
24 | 24 | static::addGlobalScope(new AssignedUser); |
25 | 25 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | { |
30 | 30 | $user = Auth::user(); |
31 | 31 | |
32 | - if($user && !$user->is_admin) |
|
32 | + if ($user && !$user->is_admin) |
|
33 | 33 | { |
34 | 34 | $module = static::getModuleFromClass(static::class); |
35 | 35 | |
36 | - if($module && $module->data && property_exists($module->data, 'private') && $module->data->private) |
|
36 | + if ($module && $module->data && property_exists($module->data, 'private') && $module->data->private) |
|
37 | 37 | { |
38 | 38 | return true; |
39 | 39 | } |
@@ -54,15 +54,15 @@ discard block |
||
54 | 54 | |
55 | 55 | protected static function getModuleFromClass($className) |
56 | 56 | { |
57 | - $modules = Cache::rememberForever('modules_by_model_class', function () { |
|
57 | + $modules = Cache::rememberForever('modules_by_model_class', function() { |
|
58 | 58 | $modulesGroupedByModelClass = collect(); |
59 | - Module::all()->map(function ($item) use ($modulesGroupedByModelClass) { |
|
60 | - $modulesGroupedByModelClass[$item->model_class] = $item; |
|
59 | + Module::all()->map(function($item) use ($modulesGroupedByModelClass) { |
|
60 | + $modulesGroupedByModelClass[ $item->model_class ] = $item; |
|
61 | 61 | return $modulesGroupedByModelClass; |
62 | 62 | }); |
63 | 63 | return $modulesGroupedByModelClass; |
64 | 64 | }); |
65 | - return $modules[(string) $className] ?? null; |
|
65 | + return $modules[ (string)$className ] ?? null; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public function getUidAttribute() |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | ->where('record_id', $this->getKey()) |
74 | 74 | ->first(); |
75 | 75 | |
76 | - if($entity) |
|
76 | + if ($entity) |
|
77 | 77 | { |
78 | 78 | $uid = $entity->getKey(); |
79 | 79 | } |
@@ -25,22 +25,22 @@ discard block |
||
25 | 25 | protected function getAllowedUsersUids() |
26 | 26 | { |
27 | 27 | // Use cache |
28 | - $allowedUserUids = Cache::rememberForever('allowed_users_for_' . Auth::user()->getKey(), function() |
|
28 | + $allowedUserUids = Cache::rememberForever('allowed_users_for_'.Auth::user()->getKey(), function() |
|
29 | 29 | { |
30 | 30 | $user = Auth::user(); |
31 | 31 | |
32 | - $allowedUserUids = [$user->uid]; |
|
32 | + $allowedUserUids = [ $user->uid ]; |
|
33 | 33 | |
34 | - $groups = []; |
|
34 | + $groups = [ ]; |
|
35 | 35 | |
36 | 36 | foreach ($user->groups as $group) { |
37 | - $groups[$group->uid] = $group; |
|
37 | + $groups[ $group->uid ] = $group; |
|
38 | 38 | }; |
39 | 39 | |
40 | 40 | $this->addRecursiveChildrenGroups($groups, $groups); |
41 | 41 | |
42 | 42 | foreach ($groups as $uid => $group) { |
43 | - $allowedUserUids[] = $uid; |
|
43 | + $allowedUserUids[ ] = $uid; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | return $allowedUserUids; |
@@ -53,14 +53,14 @@ discard block |
||
53 | 53 | { |
54 | 54 | foreach ($searchGroups as $uid => $searchGroup) |
55 | 55 | { |
56 | - $searchChildrenGroups = []; |
|
56 | + $searchChildrenGroups = [ ]; |
|
57 | 57 | |
58 | 58 | foreach ($searchGroup->childrenGroups as $childrenGroup) |
59 | 59 | { |
60 | - if(empty($groups[$childrenGroup->uid])) |
|
60 | + if (empty($groups[ $childrenGroup->uid ])) |
|
61 | 61 | { |
62 | - $groups[$childrenGroup->uid] = $childrenGroup; |
|
63 | - $searchChildrenGroups[$childrenGroup->uid] = $childrenGroup; |
|
62 | + $groups[ $childrenGroup->uid ] = $childrenGroup; |
|
63 | + $searchChildrenGroups[ $childrenGroup->uid ] = $childrenGroup; |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 |
@@ -183,8 +183,7 @@ |
||
183 | 183 | if (is_numeric($idOrUid)) |
184 | 184 | { |
185 | 185 | $className::find($idOrUid); |
186 | - } |
|
187 | - else |
|
186 | + } else |
|
188 | 187 | { |
189 | 188 | return uccello()->getRecordByUid($idOrUid); |
190 | 189 | } |
@@ -274,15 +274,15 @@ |
||
274 | 274 | |
275 | 275 | // Redirect to source record if a relation was deleted |
276 | 276 | if (isset($relatedlist) && $request->input('id')) { |
277 | - $params = ['id' => $request->input('id')]; |
|
277 | + $params = [ 'id' => $request->input('id') ]; |
|
278 | 278 | |
279 | 279 | // Add tab id if defined to select it automaticaly |
280 | 280 | if ($request->input('tab')) { |
281 | - $params['tab'] = $request->input('tab'); |
|
281 | + $params[ 'tab' ] = $request->input('tab'); |
|
282 | 282 | } |
283 | 283 | // Add related list id to select the related tab automaticaly |
284 | 284 | else { |
285 | - $params['relatedlist'] = $relatedlist->id; |
|
285 | + $params[ 'relatedlist' ] = $relatedlist->id; |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | $route = ucroute('uccello.detail', $domain, $relatedlist->module, $params); |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | public function down() |
45 | 45 | { |
46 | 46 | // Drop table |
47 | - Schema::dropIfExists($this->tablePrefix . 'uccello_groups'); |
|
48 | - Schema::dropIfExists($this->tablePrefix . 'uccello_rl_groups_groups'); |
|
49 | - Schema::dropIfExists($this->tablePrefix . 'uccello_rl_groups_users'); |
|
47 | + Schema::dropIfExists($this->tablePrefix.'uccello_groups'); |
|
48 | + Schema::dropIfExists($this->tablePrefix.'uccello_rl_groups_groups'); |
|
49 | + Schema::dropIfExists($this->tablePrefix.'uccello_rl_groups_users'); |
|
50 | 50 | |
51 | 51 | // Delete module |
52 | 52 | Module::where('name', 'group')->forceDelete(); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | protected function createTables() |
56 | 56 | { |
57 | 57 | // Module Table |
58 | - Schema::create($this->tablePrefix . 'uccello_groups', function (Blueprint $table) { |
|
58 | + Schema::create($this->tablePrefix.'uccello_groups', function(Blueprint $table) { |
|
59 | 59 | $table->increments('id'); |
60 | 60 | $table->string('name')->nullable(); |
61 | 61 | $table->text('description')->nullable(); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | }); |
67 | 67 | |
68 | 68 | // Related List Table: Groups-Groups |
69 | - Schema::create($this->tablePrefix . 'uccello_rl_groups_groups', function (Blueprint $table) { |
|
69 | + Schema::create($this->tablePrefix.'uccello_rl_groups_groups', function(Blueprint $table) { |
|
70 | 70 | $table->increments('id'); |
71 | 71 | $table->unsignedInteger('parent_id'); |
72 | 72 | $table->unsignedInteger('children_id'); |
@@ -74,19 +74,19 @@ discard block |
||
74 | 74 | |
75 | 75 | // Foreign keys |
76 | 76 | $table->foreign('parent_id') |
77 | - ->references('id')->on($this->tablePrefix . 'uccello_groups') |
|
77 | + ->references('id')->on($this->tablePrefix.'uccello_groups') |
|
78 | 78 | ->onDelete('cascade'); |
79 | 79 | |
80 | 80 | $table->foreign('children_id') |
81 | - ->references('id')->on($this->tablePrefix . 'uccello_groups') |
|
81 | + ->references('id')->on($this->tablePrefix.'uccello_groups') |
|
82 | 82 | ->onDelete('cascade'); |
83 | 83 | |
84 | 84 | // Unique keys |
85 | - $table->unique(['parent_id', 'children_id']); |
|
85 | + $table->unique([ 'parent_id', 'children_id' ]); |
|
86 | 86 | }); |
87 | 87 | |
88 | 88 | // Related List Table: Groups-Users |
89 | - Schema::create($this->tablePrefix . 'uccello_rl_groups_users', function (Blueprint $table) { |
|
89 | + Schema::create($this->tablePrefix.'uccello_rl_groups_users', function(Blueprint $table) { |
|
90 | 90 | $table->increments('id'); |
91 | 91 | $table->unsignedInteger('group_id'); |
92 | 92 | $table->unsignedInteger('user_id'); |
@@ -94,15 +94,15 @@ discard block |
||
94 | 94 | |
95 | 95 | // Foreign keys |
96 | 96 | $table->foreign('group_id') |
97 | - ->references('id')->on($this->tablePrefix . 'uccello_groups') |
|
97 | + ->references('id')->on($this->tablePrefix.'uccello_groups') |
|
98 | 98 | ->onDelete('cascade'); |
99 | 99 | |
100 | 100 | $table->foreign('user_id') |
101 | - ->references('id')->on($this->tablePrefix . 'users') |
|
101 | + ->references('id')->on($this->tablePrefix.'users') |
|
102 | 102 | ->onDelete('cascade'); |
103 | 103 | |
104 | 104 | // Unique keys |
105 | - $table->unique(['group_id', 'user_id']); |
|
105 | + $table->unique([ 'group_id', 'user_id' ]); |
|
106 | 106 | }); |
107 | 107 | } |
108 | 108 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $filter->user_id = null; |
169 | 169 | $filter->name = 'filter.all'; |
170 | 170 | $filter->type = 'list'; |
171 | - $filter->columns = [ 'name', 'description']; |
|
171 | + $filter->columns = [ 'name', 'description' ]; |
|
172 | 172 | $filter->conditions = null; |
173 | 173 | $filter->order_by = null; |
174 | 174 | $filter->is_default = true; |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | 'method' => 'getRelatedList', |
201 | 201 | 'data' => [ |
202 | 202 | "relationName" => "childrenGroups", |
203 | - "actions" => ["select", "add"] |
|
203 | + "actions" => [ "select", "add" ] |
|
204 | 204 | ], |
205 | 205 | 'sequence' => 0 |
206 | 206 | ]); |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | 'label' => 'relatedlist.users', |
218 | 218 | 'type' => 'n-n', |
219 | 219 | 'method' => 'getRelatedList', |
220 | - 'data' => ["actions" => ["select", "add"]], |
|
220 | + 'data' => [ "actions" => [ "select", "add" ] ], |
|
221 | 221 | 'sequence' => 0 |
222 | 222 | ]); |
223 | 223 | } |