@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | }); |
54 | 54 | |
55 | 55 | $validator = Validator::make(request()->all(), [ |
56 | - 'username' => $rules['username'], |
|
57 | - 'name' => $rules['name'], |
|
58 | - 'email' => $rules['email'], |
|
56 | + 'username' => $rules[ 'username' ], |
|
57 | + 'name' => $rules[ 'name' ], |
|
58 | + 'email' => $rules[ 'email' ], |
|
59 | 59 | ]); |
60 | 60 | |
61 | 61 | if ($validator->fails()) { |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | if (request('avatar')) { |
95 | 95 | $image = str_replace('data:image/png;base64,', '', request('avatar')); |
96 | 96 | $image = str_replace(' ', '+', $image); |
97 | - $imageName = 'user-' . $user->id . '.png'; |
|
97 | + $imageName = 'user-'.$user->id.'.png'; |
|
98 | 98 | $path = storage_path('app/public/avatar/'); |
99 | - $filepath = $path . $imageName; |
|
99 | + $filepath = $path.$imageName; |
|
100 | 100 | |
101 | - if(!\File::isDirectory($path)){ |
|
101 | + if (!\File::isDirectory($path)) { |
|
102 | 102 | \File::makeDirectory($path, 0777, true, true); |
103 | 103 | } |
104 | 104 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | $field = Field::where('module_id', ucmodule('user')->id)->where('name', 'password')->first(); |
131 | 131 | $password_rules = isset($field->data->rules) ? explode('|', $field->data->rules) : ''; |
132 | - $password_rules[] = 'confirmed'; |
|
132 | + $password_rules[ ] = 'confirmed'; |
|
133 | 133 | |
134 | 134 | $validator = Validator::make(request()->all(), [ |
135 | 135 | 'current_password' => function($attribute, $value, $fail) use ($user) { |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | |
173 | 173 | $data = $userSettings->data ?? new \stdClass; |
174 | 174 | |
175 | - foreach ((array) request('settings') as $key => $value) { |
|
175 | + foreach ((array)request('settings') as $key => $value) { |
|
176 | 176 | if ($value === 'true') { |
177 | 177 | $value = true; |
178 | 178 | } elseif ($value === 'false') { |
@@ -19,14 +19,14 @@ discard block |
||
19 | 19 | $domain = Domain::firstOrFail(); |
20 | 20 | } |
21 | 21 | |
22 | - return Cache::rememberForever('domains_root_user_'.auth()->id(), function () use($domain) { |
|
22 | + return Cache::rememberForever('domains_root_user_'.auth()->id(), function() use($domain) { |
|
23 | 23 | $rootDomains = app('uccello')->getRootDomains(); |
24 | 24 | |
25 | - $domains = []; |
|
25 | + $domains = [ ]; |
|
26 | 26 | foreach ($rootDomains as $_domain) { |
27 | 27 | $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain); |
28 | 28 | if ($formattedDomain) { |
29 | - $domains[] = $formattedDomain; |
|
29 | + $domains[ ] = $formattedDomain; |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | |
49 | 49 | $parentDomain = Domain::find(request('id')); |
50 | 50 | |
51 | - return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function () use($domain, $parentDomain) { |
|
52 | - $domains = []; |
|
51 | + return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function() use($domain, $parentDomain) { |
|
52 | + $domains = [ ]; |
|
53 | 53 | if ($parentDomain) { |
54 | 54 | foreach ($parentDomain->children()->orderBy('name')->get() as $_domain) { |
55 | 55 | $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain); |
56 | 56 | if ($formattedDomain) { |
57 | - $domains[] = $formattedDomain; |
|
57 | + $domains[ ] = $formattedDomain; |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | } |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | public function down() |
45 | 45 | { |
46 | 46 | // Drop table |
47 | - Schema::dropIfExists($this->tablePrefix . 'groups'); |
|
48 | - Schema::dropIfExists($this->tablePrefix . 'rl_groups_groups'); |
|
49 | - Schema::dropIfExists($this->tablePrefix . 'rl_groups_users'); |
|
47 | + Schema::dropIfExists($this->tablePrefix.'groups'); |
|
48 | + Schema::dropIfExists($this->tablePrefix.'rl_groups_groups'); |
|
49 | + Schema::dropIfExists($this->tablePrefix.'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 . 'groups', function (Blueprint $table) { |
|
58 | + Schema::create($this->tablePrefix.'groups', function(Blueprint $table) { |
|
59 | 59 | $table->increments('id'); |
60 | 60 | $table->string('name')->nullable(); |
61 | 61 | $table->text('description')->nullable(); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | }); |
65 | 65 | |
66 | 66 | // Related List Table: Groups-Groups |
67 | - Schema::create($this->tablePrefix . 'rl_groups_groups', function (Blueprint $table) { |
|
67 | + Schema::create($this->tablePrefix.'rl_groups_groups', function(Blueprint $table) { |
|
68 | 68 | $table->increments('id'); |
69 | 69 | $table->unsignedInteger('parent_id'); |
70 | 70 | $table->unsignedInteger('children_id'); |
@@ -72,19 +72,19 @@ discard block |
||
72 | 72 | |
73 | 73 | // Foreign keys |
74 | 74 | $table->foreign('parent_id') |
75 | - ->references('id')->on($this->tablePrefix . 'groups') |
|
75 | + ->references('id')->on($this->tablePrefix.'groups') |
|
76 | 76 | ->onDelete('cascade'); |
77 | 77 | |
78 | 78 | $table->foreign('children_id') |
79 | - ->references('id')->on($this->tablePrefix . 'groups') |
|
79 | + ->references('id')->on($this->tablePrefix.'groups') |
|
80 | 80 | ->onDelete('cascade'); |
81 | 81 | |
82 | 82 | // Unique keys |
83 | - $table->unique(['parent_id', 'children_id']); |
|
83 | + $table->unique([ 'parent_id', 'children_id' ]); |
|
84 | 84 | }); |
85 | 85 | |
86 | 86 | // Related List Table: Groups-Users |
87 | - Schema::create($this->tablePrefix . 'rl_groups_users', function (Blueprint $table) { |
|
87 | + Schema::create($this->tablePrefix.'rl_groups_users', function(Blueprint $table) { |
|
88 | 88 | $table->increments('id'); |
89 | 89 | $table->unsignedInteger('group_id'); |
90 | 90 | $table->unsignedInteger('user_id'); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | // Foreign keys |
94 | 94 | $table->foreign('group_id') |
95 | - ->references('id')->on($this->tablePrefix . 'groups') |
|
95 | + ->references('id')->on($this->tablePrefix.'groups') |
|
96 | 96 | ->onDelete('cascade'); |
97 | 97 | |
98 | 98 | $table->foreign('user_id') |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | ->onDelete('cascade'); |
101 | 101 | |
102 | 102 | // Unique keys |
103 | - $table->unique(['group_id', 'user_id']); |
|
103 | + $table->unique([ 'group_id', 'user_id' ]); |
|
104 | 104 | }); |
105 | 105 | } |
106 | 106 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | $filter->user_id = null; |
167 | 167 | $filter->name = 'filter.all'; |
168 | 168 | $filter->type = 'list'; |
169 | - $filter->columns = [ 'name', 'description']; |
|
169 | + $filter->columns = [ 'name', 'description' ]; |
|
170 | 170 | $filter->conditions = null; |
171 | 171 | $filter->order_by = null; |
172 | 172 | $filter->is_default = true; |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | 'method' => 'getRelatedList', |
199 | 199 | 'data' => [ |
200 | 200 | "relationName" => "childrenGroups", |
201 | - "actions" => ["select", "add"] |
|
201 | + "actions" => [ "select", "add" ] |
|
202 | 202 | ], |
203 | 203 | 'sequence' => 0 |
204 | 204 | ]); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | 'label' => 'relatedlist.users', |
216 | 216 | 'type' => 'n-n', |
217 | 217 | 'method' => 'getRelatedList', |
218 | - 'data' => ["actions" => ["select", "add"]], |
|
218 | + 'data' => [ "actions" => [ "select", "add" ] ], |
|
219 | 219 | 'sequence' => 1 |
220 | 220 | ]); |
221 | 221 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function up() |
18 | 18 | { |
19 | - Schema::create($this->tablePrefix . 'user_settings', function (Blueprint $table) { |
|
19 | + Schema::create($this->tablePrefix.'user_settings', function(Blueprint $table) { |
|
20 | 20 | $table->unsignedInteger('user_id')->primary(); |
21 | 21 | $table->longText('data'); |
22 | 22 | $table->timestamps(); |
@@ -32,6 +32,6 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function down() |
34 | 34 | { |
35 | - Schema::dropIfExists($this->tablePrefix . 'user_settings'); |
|
35 | + Schema::dropIfExists($this->tablePrefix.'user_settings'); |
|
36 | 36 | } |
37 | 37 | } |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | // Create uuid after save |
31 | - static::created(function ($model) { |
|
31 | + static::created(function($model) { |
|
32 | 32 | $module = Module::where('model_class', get_class($model))->first(); |
33 | 33 | if ($module) { |
34 | 34 | Entity::create([ |
35 | - 'id' => (string) Str::uuid(), |
|
35 | + 'id' => (string)Str::uuid(), |
|
36 | 36 | 'module_id' => $module->id, |
37 | 37 | 'record_id' => $model->getKey(), |
38 | 38 | ]); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | }); |
41 | 41 | |
42 | 42 | // Delete uuid after forced delete |
43 | - static::deleted(function ($model) { |
|
43 | + static::deleted(function($model) { |
|
44 | 44 | if (!empty($model->uuid) && (!method_exists($model, 'isForceDeleting') || $model->isForceDeleting() === true)) { |
45 | 45 | $entity = Entity::find($model->uuid); |
46 | 46 | if ($entity) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | public function initializeUccelloModule() |
54 | 54 | { |
55 | - $this->appends = array_merge($this->appends, ['recordLabel','uuid']); |
|
55 | + $this->appends = array_merge($this->appends, [ 'recordLabel', 'uuid' ]); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | protected static function isFilteredByUser() |
@@ -84,15 +84,15 @@ discard block |
||
84 | 84 | |
85 | 85 | protected static function getModuleFromClass($className) |
86 | 86 | { |
87 | - $modules = Cache::rememberForever('modules_by_model_class', function () { |
|
87 | + $modules = Cache::rememberForever('modules_by_model_class', function() { |
|
88 | 88 | $modulesGroupedByModelClass = collect(); |
89 | - Module::all()->map(function ($item) use ($modulesGroupedByModelClass) { |
|
90 | - $modulesGroupedByModelClass[$item->model_class] = $item; |
|
89 | + Module::all()->map(function($item) use ($modulesGroupedByModelClass) { |
|
90 | + $modulesGroupedByModelClass[ $item->model_class ] = $item; |
|
91 | 91 | return $modulesGroupedByModelClass; |
92 | 92 | }); |
93 | 93 | return $modulesGroupedByModelClass; |
94 | 94 | }); |
95 | - return $modules[(string) $className] ?? null; |
|
95 | + return $modules[ (string)$className ] ?? null; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | public function getUuidAttribute() |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $this->preProcess($domain, $module, $request); |
161 | 161 | |
162 | 162 | // Retrieve record |
163 | - $recordId = (int) request('id'); |
|
163 | + $recordId = (int)request('id'); |
|
164 | 164 | $modelClass = $module->model_class; |
165 | 165 | $record = $modelClass::onlyTrashed()->findOrFail($recordId); |
166 | 166 | |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | } |
173 | 173 | |
174 | 174 | // Redirect to the trash list |
175 | - $route = ucroute('uccello.list', $domain, $module, ['filter' => 'trash']); |
|
175 | + $route = ucroute('uccello.list', $domain, $module, [ 'filter' => 'trash' ]); |
|
176 | 176 | return redirect($route); |
177 | 177 | } |
178 | 178 | |
@@ -306,15 +306,15 @@ discard block |
||
306 | 306 | |
307 | 307 | // Redirect to source record if a relation was deleted |
308 | 308 | if (isset($relatedlist) && $request->input('id')) { |
309 | - $params = ['id' => $request->input('id')]; |
|
309 | + $params = [ 'id' => $request->input('id') ]; |
|
310 | 310 | |
311 | 311 | // Add tab id if defined to select it automaticaly |
312 | 312 | if ($request->input('tab')) { |
313 | - $params['tab'] = $request->input('tab'); |
|
313 | + $params[ 'tab' ] = $request->input('tab'); |
|
314 | 314 | } |
315 | 315 | // Add related list id to select the related tab automaticaly |
316 | 316 | else { |
317 | - $params['relatedlist'] = $relatedlist->id; |
|
317 | + $params[ 'relatedlist' ] = $relatedlist->id; |
|
318 | 318 | } |
319 | 319 | |
320 | 320 | $route = ucroute('uccello.detail', $domain, $relatedlist->module, $params); |
@@ -48,17 +48,17 @@ discard block |
||
48 | 48 | // Get filters |
49 | 49 | $filters = Filter::where('module_id', $module->id) // Module |
50 | 50 | ->where('type', 'list') // Type (list) |
51 | - ->where(function ($query) use($domain) { // Domain |
|
51 | + ->where(function($query) use($domain) { // Domain |
|
52 | 52 | $query->whereNull('domain_id') |
53 | 53 | ->orWhere('domain_id', $domain->getKey()); |
54 | 54 | }) |
55 | - ->where(function ($query) { // User |
|
55 | + ->where(function($query) { // User |
|
56 | 56 | $query->where('is_public', true) |
57 | - ->orWhere(function ($query) { |
|
57 | + ->orWhere(function($query) { |
|
58 | 58 | $query->where('is_public', false) |
59 | 59 | ->where('user_id', '=', auth()->id()); |
60 | 60 | }) |
61 | - ->orWhere(function ($query) { |
|
61 | + ->orWhere(function($query) { |
|
62 | 62 | $query->where('is_public', false) |
63 | 63 | ->whereNull('user_id'); |
64 | 64 | }); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ->get(); |
68 | 68 | |
69 | 69 | // Order |
70 | - $filterOrder = (array) $selectedFilter->order; |
|
70 | + $filterOrder = (array)$selectedFilter->order; |
|
71 | 71 | |
72 | 72 | // See descendants |
73 | 73 | $seeDescendants = request()->session()->get('descendants'); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | if ($relatedList && $relatedList->method) { |
151 | 151 | // Related list method |
152 | 152 | $method = $relatedList->method; |
153 | - $recordIdsMethod = $method . 'RecordIds'; |
|
153 | + $recordIdsMethod = $method.'RecordIds'; |
|
154 | 154 | |
155 | 155 | // Get related records ids |
156 | 156 | $model = new $modelClass; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | // Add the record id itself to be filtered |
160 | 160 | if ($relatedList->module_id === $relatedList->related_module_id && !empty($recordId) && !$filteredRecordIds->contains($recordId)) { |
161 | - $filteredRecordIds[] = (int)$recordId; |
|
161 | + $filteredRecordIds[ ] = (int)$recordId; |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | // Make the quer |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $records = $query->paginate($length); |
170 | 170 | } |
171 | 171 | |
172 | - $records->getCollection()->transform(function ($record) use ($domain, $module) { |
|
172 | + $records->getCollection()->transform(function($record) use ($domain, $module) { |
|
173 | 173 | foreach ($module->fields as $field) { |
174 | 174 | // If a special template exists, use it. Else use the generic template |
175 | 175 | $uitype = uitype($field->uitype_id); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | $results = collect(); |
214 | 214 | if (method_exists($modelClass, 'getSearchResult') && property_exists($modelClass, 'searchableColumns')) { |
215 | 215 | $searchResults = new Search(); |
216 | - $searchResults->registerModel($modelClass, (array) (new $modelClass)->searchableColumns); |
|
216 | + $searchResults->registerModel($modelClass, (array)(new $modelClass)->searchableColumns); |
|
217 | 217 | $results = $searchResults->search($q)->take(config('uccello.max_results.autocomplete', 10)); |
218 | 218 | } |
219 | 219 | |
@@ -234,9 +234,9 @@ discard block |
||
234 | 234 | $savePageLength = $request->input('save_page_length'); |
235 | 235 | |
236 | 236 | // Optional data |
237 | - $data = []; |
|
237 | + $data = [ ]; |
|
238 | 238 | if ($savePageLength) { |
239 | - $data["length"] = $request->input('page_length'); |
|
239 | + $data[ "length" ] = $request->input('page_length'); |
|
240 | 240 | } |
241 | 241 | |
242 | 242 | $filter = Filter::firstOrNew([ |