@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | "$this->viewPrefix.index", |
260 | 260 | "twill::$this->moduleName.index", |
261 | 261 | "twill::layouts.listing", |
262 | - ])->first(function ($view) { |
|
262 | + ])->first(function($view) { |
|
263 | 263 | return View::exists($view); |
264 | 264 | }); |
265 | 265 | |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | "$this->viewPrefix.form", |
340 | 340 | "twill::$this->moduleName.form", |
341 | 341 | "twill::layouts.form", |
342 | - ])->first(function ($view) { |
|
342 | + ])->first(function($view) { |
|
343 | 343 | return View::exists($view); |
344 | 344 | }); |
345 | 345 | |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | "$this->viewPrefix.form", |
456 | 456 | "twill::$this->moduleName.form", |
457 | 457 | "twill::layouts.form", |
458 | - ])->first(function ($view) { |
|
458 | + ])->first(function($view) { |
|
459 | 459 | return View::exists($view); |
460 | 460 | }); |
461 | 461 | |
@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | $query = $this->request->input('q'); |
649 | 649 | $tags = $this->repository->getTags($query); |
650 | 650 | |
651 | - return Response::json(['items' => $tags->map(function ($tag) { |
|
651 | + return Response::json(['items' => $tags->map(function($tag) { |
|
652 | 652 | return $tag->name; |
653 | 653 | })], 200); |
654 | 654 | } |
@@ -732,8 +732,8 @@ discard block |
||
732 | 732 | protected function getIndexTableData($items) |
733 | 733 | { |
734 | 734 | $translated = $this->moduleHas('translations'); |
735 | - return $items->map(function ($item) use ($translated) { |
|
736 | - $columnsData = Collection::make($this->indexColumns)->mapWithKeys(function ($column) use ($item) { |
|
735 | + return $items->map(function($item) use ($translated) { |
|
736 | + $columnsData = Collection::make($this->indexColumns)->mapWithKeys(function($column) use ($item) { |
|
737 | 737 | return $this->getItemColumnData($item, $column); |
738 | 738 | })->toArray(); |
739 | 739 | |
@@ -986,7 +986,7 @@ discard block |
||
986 | 986 | 'feature', |
987 | 987 | 'bulkFeature', |
988 | 988 | 'bulkDelete', |
989 | - ])->mapWithKeys(function ($endpoint) use ($moduleName, $routePrefix) { |
|
989 | + ])->mapWithKeys(function($endpoint) use ($moduleName, $routePrefix) { |
|
990 | 990 | return [ |
991 | 991 | $endpoint . 'Url' => $this->getIndexOption($endpoint) ? moduleRoute( |
992 | 992 | $this->moduleName, $this->routePrefix, $endpoint, |
@@ -1002,7 +1002,7 @@ discard block |
||
1002 | 1002 | */ |
1003 | 1003 | protected function getIndexOption($option) |
1004 | 1004 | { |
1005 | - return once(function () use ($option) { |
|
1005 | + return once(function() use ($option) { |
|
1006 | 1006 | $customOptionNamesMapping = [ |
1007 | 1007 | 'store' => 'create', |
1008 | 1008 | ]; |
@@ -1055,8 +1055,8 @@ discard block |
||
1055 | 1055 | { |
1056 | 1056 | $withImage = $this->moduleHas('medias'); |
1057 | 1057 | |
1058 | - return $items->map(function ($item) use ($withImage) { |
|
1059 | - $columnsData = Collection::make($this->browserColumns)->mapWithKeys(function ($column) use ($item, $withImage) { |
|
1058 | + return $items->map(function($item) use ($withImage) { |
|
1059 | + $columnsData = Collection::make($this->browserColumns)->mapWithKeys(function($column) use ($item, $withImage) { |
|
1060 | 1060 | return $this->getItemColumnData($item, $column); |
1061 | 1061 | })->toArray(); |
1062 | 1062 | |
@@ -1122,7 +1122,7 @@ discard block |
||
1122 | 1122 | $fieldSplitted = explode('|', $field); |
1123 | 1123 | if (count($fieldSplitted) > 1) { |
1124 | 1124 | $requestValue = $requestFilters[$key]; |
1125 | - Collection::make($fieldSplitted)->each(function ($scopeKey) use (&$scope, $requestValue) { |
|
1125 | + Collection::make($fieldSplitted)->each(function($scopeKey) use (&$scope, $requestValue) { |
|
1126 | 1126 | $scope[$scopeKey] = $requestValue; |
1127 | 1127 | }); |
1128 | 1128 | } else { |
@@ -1200,7 +1200,7 @@ discard block |
||
1200 | 1200 | 'permalinkPrefix' => $this->getPermalinkPrefix($baseUrl), |
1201 | 1201 | 'saveUrl' => $this->getModuleRoute($item->id, 'update'), |
1202 | 1202 | 'editor' => $this->moduleHas('revisions') && $this->moduleHas('blocks') && !$this->disableEditor, |
1203 | - 'blockPreviewUrl' => Route::has('admin.blocks.preview')? URL::route('admin.blocks.preview') : '#', |
|
1203 | + 'blockPreviewUrl' => Route::has('admin.blocks.preview') ? URL::route('admin.blocks.preview') : '#', |
|
1204 | 1204 | 'revisions' => $this->moduleHas('revisions') ? $item->revisionsArray() : null, |
1205 | 1205 | ] + (Route::has($previewRouteName) ? [ |
1206 | 1206 | 'previewUrl' => moduleRoute($this->moduleName, $this->routePrefix, 'preview', $item->id), |
@@ -1268,11 +1268,11 @@ discard block |
||
1268 | 1268 | */ |
1269 | 1269 | protected function validateFormRequest() |
1270 | 1270 | { |
1271 | - $unauthorizedFields = Collection::make($this->fieldsPermissions)->filter(function ($permission, $field) { |
|
1271 | + $unauthorizedFields = Collection::make($this->fieldsPermissions)->filter(function($permission, $field) { |
|
1272 | 1272 | return Auth::guard('twill_users')->user()->cannot($permission); |
1273 | 1273 | })->keys(); |
1274 | 1274 | |
1275 | - $unauthorizedFields->each(function ($field) { |
|
1275 | + $unauthorizedFields->each(function($field) { |
|
1276 | 1276 | $this->request->offsetUnset($field); |
1277 | 1277 | }); |
1278 | 1278 |
@@ -56,16 +56,16 @@ |
||
56 | 56 | |
57 | 57 | $blocksCollection->push($newBlock); |
58 | 58 | |
59 | - $block['blocks']->each(function ($childBlock) use ($newBlock, $blocksCollection, $blockRepository) { |
|
59 | + $block['blocks']->each(function($childBlock) use ($newBlock, $blocksCollection, $blockRepository) { |
|
60 | 60 | $childBlock['parent_id'] = $newBlock->id; |
61 | 61 | $newChildBlock = $blockRepository->createForPreview($childBlock); |
62 | 62 | $blocksCollection->push($newChildBlock); |
63 | 63 | }); |
64 | 64 | |
65 | - $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function ($block) use ($blocksCollection, $viewFactory, $config) { |
|
65 | + $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function($block) use ($blocksCollection, $viewFactory, $config) { |
|
66 | 66 | if ($config->get('twill.block_editor.block_preview_render_childs') ?? true) { |
67 | 67 | $childBlocks = $blocksCollection->where('parent_id', $block->id); |
68 | - $renderedChildViews = $childBlocks->map(function ($childBlock) use ($viewFactory, $config) { |
|
68 | + $renderedChildViews = $childBlocks->map(function($childBlock) use ($viewFactory, $config) { |
|
69 | 69 | $view = $this->getBlockView($childBlock->type, $config); |
70 | 70 | |
71 | 71 | return $viewFactory->exists($view) ? $viewFactory->make($view, [ |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | { |
109 | 109 | $modules = Collection::make($this->config->get('twill.dashboard.modules')); |
110 | 110 | |
111 | - return $modules->filter(function ($module) { |
|
111 | + return $modules->filter(function($module) { |
|
112 | 112 | return ($module['search'] ?? false); |
113 | - })->map(function ($module) use ($request) { |
|
113 | + })->map(function($module) use ($request) { |
|
114 | 114 | $repository = $this->getRepository($module['name']); |
115 | 115 | |
116 | 116 | $found = $repository->cmsSearch($request->get('search'), $module['search_fields'] ?? ['title'])->take(10); |
117 | 117 | |
118 | - return $found->map(function ($item) use ($module) { |
|
118 | + return $found->map(function($item) use ($module) { |
|
119 | 119 | try { |
120 | 120 | $author = $item->revisions()->latest()->first()->user->name ?? 'Admin'; |
121 | 121 | } catch (\Exception $e) { |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | */ |
143 | 143 | private function getAllActivities() |
144 | 144 | { |
145 | - return Activity::take(20)->latest()->get()->map(function ($activity) { |
|
145 | + return Activity::take(20)->latest()->get()->map(function($activity) { |
|
146 | 146 | return $this->formatActivity($activity); |
147 | 147 | })->filter()->values(); |
148 | 148 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | private function getLoggedInUserActivities() |
154 | 154 | { |
155 | - return Activity::where('causer_id', $this->authFactory->guard('twill_users')->user()->id)->take(20)->latest()->get()->map(function ($activity) { |
|
155 | + return Activity::where('causer_id', $this->authFactory->guard('twill_users')->user()->id)->take(20)->latest()->get()->map(function($activity) { |
|
156 | 156 | return $this->formatActivity($activity); |
157 | 157 | })->filter()->values(); |
158 | 158 | } |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | return []; |
202 | 202 | } |
203 | 203 | |
204 | - $statsByDate = Collection::make($response['rows'] ?? [])->map(function (array $dateRow) { |
|
204 | + $statsByDate = Collection::make($response['rows'] ?? [])->map(function(array $dateRow) { |
|
205 | 205 | return [ |
206 | 206 | 'date' => $dateRow[0], |
207 | 207 | 'users' => (int) $dateRow[1], |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | 'yesterday', |
217 | 217 | 'week', |
218 | 218 | 'month', |
219 | - ])->mapWithKeys(function ($period) use ($statsByDate) { |
|
219 | + ])->mapWithKeys(function($period) use ($statsByDate) { |
|
220 | 220 | $stats = $this->getPeriodStats($period, $statsByDate); |
221 | 221 | return [ |
222 | 222 | $period => [ |
@@ -253,10 +253,10 @@ discard block |
||
253 | 253 | 'stats' => $stats = $statsByDate->first(), |
254 | 254 | 'moreUsers' => $stats['users'] > $statsByDate->get(1)['users'], |
255 | 255 | 'morePageViews' => $stats['pageViews'] > $statsByDate->get(1)['pageViews'], |
256 | - 'usersData' => $statsByDate->take(7)->map(function ($stat) { |
|
256 | + 'usersData' => $statsByDate->take(7)->map(function($stat) { |
|
257 | 257 | return $stat['users']; |
258 | 258 | }), |
259 | - 'pageViewsData' => $statsByDate->take(7)->map(function ($stat) { |
|
259 | + 'pageViewsData' => $statsByDate->take(7)->map(function($stat) { |
|
260 | 260 | return $stat['pageViews']; |
261 | 261 | }), |
262 | 262 | ]; |
@@ -265,10 +265,10 @@ discard block |
||
265 | 265 | 'stats' => $stats = $statsByDate->get(1), |
266 | 266 | 'moreUsers' => $stats['users'] > $statsByDate->get(2)['users'], |
267 | 267 | 'morePageViews' => $stats['pageViews'] > $statsByDate->get(2)['pageViews'], |
268 | - 'usersData' => $statsByDate->slice(1)->take(7)->map(function ($stat) { |
|
268 | + 'usersData' => $statsByDate->slice(1)->take(7)->map(function($stat) { |
|
269 | 269 | return $stat['users']; |
270 | 270 | }), |
271 | - 'pageViewsData' => $statsByDate->slice(1)->take(7)->map(function ($stat) { |
|
271 | + 'pageViewsData' => $statsByDate->slice(1)->take(7)->map(function($stat) { |
|
272 | 272 | return $stat['pageViews']; |
273 | 273 | }), |
274 | 274 | ]; |
@@ -291,10 +291,10 @@ discard block |
||
291 | 291 | 'stats' => $stats, |
292 | 292 | 'moreUsers' => $stats['users'] > $compareStats['users'], |
293 | 293 | 'morePageViews' => $stats['pageViews'] > $compareStats['pageViews'], |
294 | - 'usersData' => $statsByDate->slice(1)->take(29)->map(function ($stat) { |
|
294 | + 'usersData' => $statsByDate->slice(1)->take(29)->map(function($stat) { |
|
295 | 295 | return $stat['users']; |
296 | 296 | }), |
297 | - 'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function ($stat) { |
|
297 | + 'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function($stat) { |
|
298 | 298 | return $stat['pageViews']; |
299 | 299 | }), |
300 | 300 | ]; |
@@ -317,10 +317,10 @@ discard block |
||
317 | 317 | 'stats' => $stats, |
318 | 318 | 'moreUsers' => $stats['users'] > $compareStats['users'], |
319 | 319 | 'morePageViews' => $stats['pageViews'] > $compareStats['pageViews'], |
320 | - 'usersData' => $statsByDate->slice(1)->take(29)->map(function ($stat) { |
|
320 | + 'usersData' => $statsByDate->slice(1)->take(29)->map(function($stat) { |
|
321 | 321 | return $stat['users']; |
322 | 322 | }), |
323 | - 'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function ($stat) { |
|
323 | + 'pageViewsData' => $statsByDate->slice(1)->take(29)->map(function($stat) { |
|
324 | 324 | return $stat['pageViews']; |
325 | 325 | }), |
326 | 326 | ]; |
@@ -346,9 +346,9 @@ discard block |
||
346 | 346 | */ |
347 | 347 | private function getShortcuts($modules) |
348 | 348 | { |
349 | - return $modules->filter(function ($module) { |
|
349 | + return $modules->filter(function($module) { |
|
350 | 350 | return ($module['count'] ?? false) || ($module['create'] ?? false); |
351 | - })->map(function ($module) { |
|
351 | + })->map(function($module) { |
|
352 | 352 | $repository = $this->getRepository($module['name']); |
353 | 353 | |
354 | 354 | $moduleOptions = [ |
@@ -385,14 +385,14 @@ discard block |
||
385 | 385 | */ |
386 | 386 | private function getDrafts($modules) |
387 | 387 | { |
388 | - return $modules->filter(function ($module) { |
|
388 | + return $modules->filter(function($module) { |
|
389 | 389 | return ($module['draft'] ?? false); |
390 | - })->map(function ($module) { |
|
390 | + })->map(function($module) { |
|
391 | 391 | $repository = $this->getRepository($module['name']); |
392 | 392 | |
393 | 393 | $drafts = $repository->draft()->mine()->limit(3)->latest()->get(); |
394 | 394 | |
395 | - return $drafts->map(function ($draft) use ($module) { |
|
395 | + return $drafts->map(function($draft) use ($module) { |
|
396 | 396 | return [ |
397 | 397 | 'type' => ucfirst($module['label_singular'] ?? Str::singular($module['name'])), |
398 | 398 | 'name' => $draft->titleInDashboard ?? $draft->title, |
@@ -40,7 +40,7 @@ |
||
40 | 40 | 'name' => 'required', |
41 | 41 | 'role' => 'not_in:SUPERADMIN', |
42 | 42 | 'email' => 'required|email|unique:' . config('twill.users_table', 'twill_users') . ',email,' . $this->route('user'), |
43 | - 'verify-code' => function ($attribute, $value, $fail) { |
|
43 | + 'verify-code' => function($attribute, $value, $fail) { |
|
44 | 44 | $user = Auth::guard('twill_users')->user(); |
45 | 45 | $with2faSettings = config('twill.enabled.users-2fa') && $user->id == $this->route('user'); |
46 | 46 |
@@ -64,7 +64,7 @@ |
||
64 | 64 | |
65 | 65 | $this->info(self::SCANNING_BLOCKS); |
66 | 66 | |
67 | - Collection::make($this->filesystem->files($path))->each(function ($viewFile) { |
|
67 | + Collection::make($this->filesystem->files($path))->each(function($viewFile) { |
|
68 | 68 | $blockName = $viewFile->getBasename('.blade.php'); |
69 | 69 | |
70 | 70 | $vueBlockTemplate = $this->viewFactory->make('admin.blocks.' . $blockName, ['renderForBlocks' => true])->render(); |
@@ -57,7 +57,7 @@ |
||
57 | 57 | // TODO: document this and actually think about moving to queuable job after content type updates |
58 | 58 | public function handle() |
59 | 59 | { |
60 | - $this->db->table('mediables')->orderBy('id')->chunk(100, function ($attached_medias) { |
|
60 | + $this->db->table('mediables')->orderBy('id')->chunk(100, function($attached_medias) { |
|
61 | 61 | foreach ($attached_medias as $attached_media) { |
62 | 62 | $uuid = Media::withTrashed()->find($attached_media->media_id, ['uuid'])->uuid; |
63 | 63 |
@@ -31,72 +31,72 @@ |
||
31 | 31 | |
32 | 32 | public function boot() |
33 | 33 | { |
34 | - Gate::define('list', function ($user) { |
|
35 | - return $this->authorize($user, function ($user) { |
|
34 | + Gate::define('list', function($user) { |
|
35 | + return $this->authorize($user, function($user) { |
|
36 | 36 | return $this->userHasRole($user, [UserRole::VIEWONLY, UserRole::PUBLISHER, UserRole::ADMIN]); |
37 | 37 | }); |
38 | 38 | }); |
39 | 39 | |
40 | - Gate::define('edit', function ($user) { |
|
41 | - return $this->authorize($user, function ($user) { |
|
40 | + Gate::define('edit', function($user) { |
|
41 | + return $this->authorize($user, function($user) { |
|
42 | 42 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
43 | 43 | }); |
44 | 44 | }); |
45 | 45 | |
46 | - Gate::define('reorder', function ($user) { |
|
47 | - return $this->authorize($user, function ($user) { |
|
46 | + Gate::define('reorder', function($user) { |
|
47 | + return $this->authorize($user, function($user) { |
|
48 | 48 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
49 | 49 | }); |
50 | 50 | }); |
51 | 51 | |
52 | - Gate::define('publish', function ($user) { |
|
53 | - return $this->authorize($user, function ($user) { |
|
52 | + Gate::define('publish', function($user) { |
|
53 | + return $this->authorize($user, function($user) { |
|
54 | 54 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
55 | 55 | }); |
56 | 56 | }); |
57 | 57 | |
58 | - Gate::define('feature', function ($user) { |
|
59 | - return $this->authorize($user, function ($user) { |
|
58 | + Gate::define('feature', function($user) { |
|
59 | + return $this->authorize($user, function($user) { |
|
60 | 60 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
61 | 61 | }); |
62 | 62 | }); |
63 | 63 | |
64 | - Gate::define('delete', function ($user) { |
|
65 | - return $this->authorize($user, function ($user) { |
|
64 | + Gate::define('delete', function($user) { |
|
65 | + return $this->authorize($user, function($user) { |
|
66 | 66 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
67 | 67 | }); |
68 | 68 | }); |
69 | 69 | |
70 | - Gate::define('upload', function ($user) { |
|
71 | - return $this->authorize($user, function ($user) { |
|
70 | + Gate::define('upload', function($user) { |
|
71 | + return $this->authorize($user, function($user) { |
|
72 | 72 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
73 | 73 | }); |
74 | 74 | }); |
75 | 75 | |
76 | - Gate::define('manage-users', function ($user) { |
|
77 | - return $this->authorize($user, function ($user) { |
|
76 | + Gate::define('manage-users', function($user) { |
|
77 | + return $this->authorize($user, function($user) { |
|
78 | 78 | return $this->userHasRole($user, [UserRole::ADMIN]); |
79 | 79 | }); |
80 | 80 | }); |
81 | 81 | |
82 | 82 | // As an admin, I can edit users, except superadmins |
83 | 83 | // As a non-admin, I can edit myself only |
84 | - Gate::define('edit-user', function ($user, $editedUser = null) { |
|
85 | - return $this->authorize($user, function ($user) use ($editedUser) { |
|
84 | + Gate::define('edit-user', function($user, $editedUser = null) { |
|
85 | + return $this->authorize($user, function($user) use ($editedUser) { |
|
86 | 86 | $editedUserObject = User::find($editedUser); |
87 | 87 | return ($this->userHasRole($user, [UserRole::ADMIN]) || $user->id == $editedUser) |
88 | 88 | && ($editedUserObject ? $editedUserObject->role !== self::SUPERADMIN : true); |
89 | 89 | }); |
90 | 90 | }); |
91 | 91 | |
92 | - Gate::define('publish-user', function ($user) { |
|
93 | - return $this->authorize($user, function ($user) { |
|
92 | + Gate::define('publish-user', function($user) { |
|
93 | + return $this->authorize($user, function($user) { |
|
94 | 94 | $editedUserObject = User::find(request('id')); |
95 | 95 | return $this->userHasRole($user, [UserRole::ADMIN]) && ($editedUserObject ? $user->id !== $editedUserObject->id && $editedUserObject->role !== self::SUPERADMIN : false); |
96 | 96 | }); |
97 | 97 | }); |
98 | 98 | |
99 | - Gate::define('impersonate', function ($user) { |
|
99 | + Gate::define('impersonate', function($user) { |
|
100 | 100 | return $user->role === self::SUPERADMIN; |
101 | 101 | }); |
102 | 102 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function byKey($key, $section = null) |
36 | 36 | { |
37 | - return $this->model->when($section, function ($query) use ($section) { |
|
37 | + return $this->model->when($section, function($query) use ($section) { |
|
38 | 38 | $query->where('section', $section); |
39 | 39 | })->where('key', $key)->exists() ? $this->model->where('key', $key)->with('translations')->first()->value : null; |
40 | 40 | } |
@@ -45,15 +45,15 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function getFormFields($section = null) |
47 | 47 | { |
48 | - $settings = $this->model->when($section, function ($query) use ($section) { |
|
48 | + $settings = $this->model->when($section, function($query) use ($section) { |
|
49 | 49 | $query->where('section', $section); |
50 | 50 | })->with('translations', 'medias')->get(); |
51 | 51 | |
52 | - $medias = $settings->mapWithKeys(function ($setting) { |
|
52 | + $medias = $settings->mapWithKeys(function($setting) { |
|
53 | 53 | return [$setting->key => parent::getFormFields($setting)['medias'][$setting->key] ?? null]; |
54 | 54 | })->filter()->toArray(); |
55 | 55 | |
56 | - return $settings->mapWithKeys(function ($setting) { |
|
56 | + return $settings->mapWithKeys(function($setting) { |
|
57 | 57 | $settingValue = []; |
58 | 58 | |
59 | 59 | foreach ($setting->translations as $translation) { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $this->updateOrCreate($section + ['key' => $role], $section + [ |
102 | 102 | 'key' => $role, |
103 | 103 | 'medias' => [ |
104 | - $role => Collection::make($settingsFields['medias'][$role])->map(function ($media) { |
|
104 | + $role => Collection::make($settingsFields['medias'][$role])->map(function($media) { |
|
105 | 105 | return json_decode($media, true); |
106 | 106 | })->values()->filter()->toArray(), |
107 | 107 | ], |
@@ -62,7 +62,7 @@ |
||
62 | 62 | */ |
63 | 63 | public function filter($query, array $scopes = []) |
64 | 64 | { |
65 | - $query->when(isset($scopes['role']), function ($query) use ($scopes) { |
|
65 | + $query->when(isset($scopes['role']), function($query) use ($scopes) { |
|
66 | 66 | $query->where('role', $scopes['role']); |
67 | 67 | }); |
68 | 68 | $query->where('role', '<>', 'SUPERADMIN'); |