@@ -8,40 +8,40 @@ |
||
| 8 | 8 | |
| 9 | 9 | class SetRelations |
| 10 | 10 | { |
| 11 | - protected $arr; |
|
| 12 | - protected $route; |
|
| 11 | + protected $arr; |
|
| 12 | + protected $route; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * Init new object. |
|
| 16 | - * |
|
| 17 | - * @param Route $route |
|
| 18 | - * @param Arr $arr |
|
| 19 | - * |
|
| 20 | - * @return void |
|
| 21 | - */ |
|
| 22 | - public function __construct(Route $route, Arr $arr) |
|
| 23 | - { |
|
| 24 | - $this->arr = $arr; |
|
| 25 | - $this->route = $route; |
|
| 26 | - } |
|
| 14 | + /** |
|
| 15 | + * Init new object. |
|
| 16 | + * |
|
| 17 | + * @param Route $route |
|
| 18 | + * @param Arr $arr |
|
| 19 | + * |
|
| 20 | + * @return void |
|
| 21 | + */ |
|
| 22 | + public function __construct(Route $route, Arr $arr) |
|
| 23 | + { |
|
| 24 | + $this->arr = $arr; |
|
| 25 | + $this->route = $route; |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Handle an incoming request. |
|
| 30 | - * |
|
| 31 | - * @param \Illuminate\Http\Request $request |
|
| 32 | - * @param \Closure $next |
|
| 33 | - * @return mixed |
|
| 34 | - */ |
|
| 35 | - public function handle($request, Closure $next) |
|
| 36 | - { |
|
| 37 | - $routeActions = explode('@', $this->route->currentRouteAction()); |
|
| 38 | - $modelName = explode('\\', $routeActions[0]); |
|
| 39 | - $modelName = lcfirst(str_replace('Controller', '', end($modelName))); |
|
| 40 | - $route = explode('@', $this->route->currentRouteAction())[1]; |
|
| 41 | - $route = $route !== 'index' ? $route : 'list'; |
|
| 42 | - $relations = $this->arr->get(config('core.relations'), $modelName, false); |
|
| 43 | - $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : []; |
|
| 28 | + /** |
|
| 29 | + * Handle an incoming request. |
|
| 30 | + * |
|
| 31 | + * @param \Illuminate\Http\Request $request |
|
| 32 | + * @param \Closure $next |
|
| 33 | + * @return mixed |
|
| 34 | + */ |
|
| 35 | + public function handle($request, Closure $next) |
|
| 36 | + { |
|
| 37 | + $routeActions = explode('@', $this->route->currentRouteAction()); |
|
| 38 | + $modelName = explode('\\', $routeActions[0]); |
|
| 39 | + $modelName = lcfirst(str_replace('Controller', '', end($modelName))); |
|
| 40 | + $route = explode('@', $this->route->currentRouteAction())[1]; |
|
| 41 | + $route = $route !== 'index' ? $route : 'list'; |
|
| 42 | + $relations = $this->arr->get(config('core.relations'), $modelName, false); |
|
| 43 | + $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : []; |
|
| 44 | 44 | |
| 45 | - return $next($request); |
|
| 46 | - } |
|
| 45 | + return $next($request); |
|
| 46 | + } |
|
| 47 | 47 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Relations Between Models |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -11,88 +11,88 @@ discard block |
||
| 11 | 11 | | |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | - 'relations' => [ |
|
| 15 | - 'user' => [ |
|
| 16 | - 'list' => [], |
|
| 17 | - 'find' => [], |
|
| 18 | - 'findby' => [], |
|
| 19 | - 'paginate' => [], |
|
| 20 | - 'paginateby' => [], |
|
| 21 | - 'first' => [], |
|
| 22 | - 'search' => [], |
|
| 23 | - 'account' => [], |
|
| 24 | - 'group' => [], |
|
| 25 | - 'deleted' => [], |
|
| 26 | - ], |
|
| 27 | - 'permission' => [ |
|
| 28 | - 'list' => [], |
|
| 29 | - 'find' => [], |
|
| 30 | - 'findby' => [], |
|
| 31 | - 'paginate' => [], |
|
| 32 | - 'paginateby' => [], |
|
| 33 | - 'first' => [], |
|
| 34 | - 'search' => [], |
|
| 35 | - 'deleted' => [], |
|
| 36 | - ], |
|
| 37 | - 'group' => [ |
|
| 38 | - 'list' => [], |
|
| 39 | - 'find' => [], |
|
| 40 | - 'findby' => [], |
|
| 41 | - 'paginate' => [], |
|
| 42 | - 'paginateby' => [], |
|
| 43 | - 'first' => [], |
|
| 44 | - 'search' => [], |
|
| 45 | - 'deleted' => [], |
|
| 46 | - ], |
|
| 47 | - 'oauthClient' => [ |
|
| 48 | - 'list' => [], |
|
| 49 | - 'find' => [], |
|
| 50 | - 'findby' => [], |
|
| 51 | - 'paginate' => [], |
|
| 52 | - 'paginateby' => [], |
|
| 53 | - 'first' => [], |
|
| 54 | - 'search' => [], |
|
| 55 | - 'account' => [], |
|
| 56 | - 'group' => [], |
|
| 57 | - 'deleted' => [], |
|
| 58 | - ], |
|
| 59 | - 'notification' => [ |
|
| 60 | - 'list' => [], |
|
| 61 | - 'unread' => [], |
|
| 62 | - ], |
|
| 63 | - 'pushNotificationDevice' => [ |
|
| 64 | - 'list' => [], |
|
| 65 | - 'find' => [], |
|
| 66 | - 'findby' => [], |
|
| 67 | - 'paginate' => [], |
|
| 68 | - 'paginateby' => [], |
|
| 69 | - 'first' => [], |
|
| 70 | - 'search' => [], |
|
| 71 | - 'deleted' => [], |
|
| 72 | - ], |
|
| 73 | - 'report' => [ |
|
| 74 | - 'list' => [], |
|
| 75 | - 'find' => [], |
|
| 76 | - 'findby' => [], |
|
| 77 | - 'paginate' => [], |
|
| 78 | - 'paginateby' => [], |
|
| 79 | - 'first' => [], |
|
| 80 | - 'search' => [], |
|
| 81 | - 'deleted' => [], |
|
| 82 | - ], |
|
| 83 | - 'setting' => [ |
|
| 84 | - 'list' => [], |
|
| 85 | - 'find' => [], |
|
| 86 | - 'findby' => [], |
|
| 87 | - 'paginate' => [], |
|
| 88 | - 'paginateby' => [], |
|
| 89 | - 'first' => [], |
|
| 90 | - 'search' => [], |
|
| 91 | - 'deleted' => [], |
|
| 92 | - ] |
|
| 93 | - ], |
|
| 14 | + 'relations' => [ |
|
| 15 | + 'user' => [ |
|
| 16 | + 'list' => [], |
|
| 17 | + 'find' => [], |
|
| 18 | + 'findby' => [], |
|
| 19 | + 'paginate' => [], |
|
| 20 | + 'paginateby' => [], |
|
| 21 | + 'first' => [], |
|
| 22 | + 'search' => [], |
|
| 23 | + 'account' => [], |
|
| 24 | + 'group' => [], |
|
| 25 | + 'deleted' => [], |
|
| 26 | + ], |
|
| 27 | + 'permission' => [ |
|
| 28 | + 'list' => [], |
|
| 29 | + 'find' => [], |
|
| 30 | + 'findby' => [], |
|
| 31 | + 'paginate' => [], |
|
| 32 | + 'paginateby' => [], |
|
| 33 | + 'first' => [], |
|
| 34 | + 'search' => [], |
|
| 35 | + 'deleted' => [], |
|
| 36 | + ], |
|
| 37 | + 'group' => [ |
|
| 38 | + 'list' => [], |
|
| 39 | + 'find' => [], |
|
| 40 | + 'findby' => [], |
|
| 41 | + 'paginate' => [], |
|
| 42 | + 'paginateby' => [], |
|
| 43 | + 'first' => [], |
|
| 44 | + 'search' => [], |
|
| 45 | + 'deleted' => [], |
|
| 46 | + ], |
|
| 47 | + 'oauthClient' => [ |
|
| 48 | + 'list' => [], |
|
| 49 | + 'find' => [], |
|
| 50 | + 'findby' => [], |
|
| 51 | + 'paginate' => [], |
|
| 52 | + 'paginateby' => [], |
|
| 53 | + 'first' => [], |
|
| 54 | + 'search' => [], |
|
| 55 | + 'account' => [], |
|
| 56 | + 'group' => [], |
|
| 57 | + 'deleted' => [], |
|
| 58 | + ], |
|
| 59 | + 'notification' => [ |
|
| 60 | + 'list' => [], |
|
| 61 | + 'unread' => [], |
|
| 62 | + ], |
|
| 63 | + 'pushNotificationDevice' => [ |
|
| 64 | + 'list' => [], |
|
| 65 | + 'find' => [], |
|
| 66 | + 'findby' => [], |
|
| 67 | + 'paginate' => [], |
|
| 68 | + 'paginateby' => [], |
|
| 69 | + 'first' => [], |
|
| 70 | + 'search' => [], |
|
| 71 | + 'deleted' => [], |
|
| 72 | + ], |
|
| 73 | + 'report' => [ |
|
| 74 | + 'list' => [], |
|
| 75 | + 'find' => [], |
|
| 76 | + 'findby' => [], |
|
| 77 | + 'paginate' => [], |
|
| 78 | + 'paginateby' => [], |
|
| 79 | + 'first' => [], |
|
| 80 | + 'search' => [], |
|
| 81 | + 'deleted' => [], |
|
| 82 | + ], |
|
| 83 | + 'setting' => [ |
|
| 84 | + 'list' => [], |
|
| 85 | + 'find' => [], |
|
| 86 | + 'findby' => [], |
|
| 87 | + 'paginate' => [], |
|
| 88 | + 'paginateby' => [], |
|
| 89 | + 'first' => [], |
|
| 90 | + 'search' => [], |
|
| 91 | + 'deleted' => [], |
|
| 92 | + ] |
|
| 93 | + ], |
|
| 94 | 94 | |
| 95 | - /* |
|
| 95 | + /* |
|
| 96 | 96 | |-------------------------------------------------------------------------- |
| 97 | 97 | | Cache Configurations |
| 98 | 98 | |-------------------------------------------------------------------------- |
@@ -101,46 +101,46 @@ discard block |
||
| 101 | 101 | | |
| 102 | 102 | */ |
| 103 | 103 | |
| 104 | - 'cache_config' => [ |
|
| 105 | - 'oauthClient' => [ |
|
| 106 | - 'cache' => [ |
|
| 107 | - 'all', |
|
| 108 | - 'find', |
|
| 109 | - 'findBy', |
|
| 110 | - 'paginate', |
|
| 111 | - 'paginateBy', |
|
| 112 | - 'first', |
|
| 113 | - 'search', |
|
| 114 | - 'deleted' |
|
| 115 | - ], |
|
| 116 | - 'clear' => [ |
|
| 117 | - 'update' => ['oauthClients', 'users', 'groups'], |
|
| 118 | - 'save' => ['oauthClients', 'users', 'groups'], |
|
| 119 | - 'delete' => ['oauthClients', 'users', 'groups'], |
|
| 120 | - 'restore' => ['oauthClients', 'users', 'groups'], |
|
| 121 | - 'revoke' => ['oauthClients', 'users', 'groups'], |
|
| 122 | - 'ubRevoke' => ['oauthClients', 'users', 'groups'], |
|
| 123 | - 'regenerateSecret' => ['oauthClients', 'users', 'groups'], |
|
| 124 | - ], |
|
| 125 | - ], |
|
| 126 | - 'setting' => [ |
|
| 127 | - 'cache' => [ |
|
| 128 | - 'all', |
|
| 129 | - 'find', |
|
| 130 | - 'findBy', |
|
| 131 | - 'paginate', |
|
| 132 | - 'paginateBy', |
|
| 133 | - 'first', |
|
| 134 | - 'search', |
|
| 135 | - 'deleted' |
|
| 136 | - ], |
|
| 137 | - 'clear' => [ |
|
| 138 | - 'update' => ['settings'], |
|
| 139 | - 'save' => ['settings'], |
|
| 140 | - 'delete' => ['settings'], |
|
| 141 | - 'restore' => ['settings'], |
|
| 142 | - 'saveMany' => ['settings'], |
|
| 143 | - ] |
|
| 144 | - ] |
|
| 145 | - ] |
|
| 104 | + 'cache_config' => [ |
|
| 105 | + 'oauthClient' => [ |
|
| 106 | + 'cache' => [ |
|
| 107 | + 'all', |
|
| 108 | + 'find', |
|
| 109 | + 'findBy', |
|
| 110 | + 'paginate', |
|
| 111 | + 'paginateBy', |
|
| 112 | + 'first', |
|
| 113 | + 'search', |
|
| 114 | + 'deleted' |
|
| 115 | + ], |
|
| 116 | + 'clear' => [ |
|
| 117 | + 'update' => ['oauthClients', 'users', 'groups'], |
|
| 118 | + 'save' => ['oauthClients', 'users', 'groups'], |
|
| 119 | + 'delete' => ['oauthClients', 'users', 'groups'], |
|
| 120 | + 'restore' => ['oauthClients', 'users', 'groups'], |
|
| 121 | + 'revoke' => ['oauthClients', 'users', 'groups'], |
|
| 122 | + 'ubRevoke' => ['oauthClients', 'users', 'groups'], |
|
| 123 | + 'regenerateSecret' => ['oauthClients', 'users', 'groups'], |
|
| 124 | + ], |
|
| 125 | + ], |
|
| 126 | + 'setting' => [ |
|
| 127 | + 'cache' => [ |
|
| 128 | + 'all', |
|
| 129 | + 'find', |
|
| 130 | + 'findBy', |
|
| 131 | + 'paginate', |
|
| 132 | + 'paginateBy', |
|
| 133 | + 'first', |
|
| 134 | + 'search', |
|
| 135 | + 'deleted' |
|
| 136 | + ], |
|
| 137 | + 'clear' => [ |
|
| 138 | + 'update' => ['settings'], |
|
| 139 | + 'save' => ['settings'], |
|
| 140 | + 'delete' => ['settings'], |
|
| 141 | + 'restore' => ['settings'], |
|
| 142 | + 'saveMany' => ['settings'], |
|
| 143 | + ] |
|
| 144 | + ] |
|
| 145 | + ] |
|
| 146 | 146 | ]; |
@@ -6,30 +6,30 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting'); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting'); |
|
| 18 | 18 | |
| 19 | - $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('reporting', 'Database/Factories', 'app')); |
|
| 21 | - if(!$this->app->configurationIsCached()) { |
|
| 22 | - $this->loadConfigsFrom(module_path('reporting', 'Config', 'app')); |
|
| 23 | - } |
|
| 24 | - } |
|
| 19 | + $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('reporting', 'Database/Factories', 'app')); |
|
| 21 | + if(!$this->app->configurationIsCached()) { |
|
| 22 | + $this->loadConfigsFrom(module_path('reporting', 'Config', 'app')); |
|
| 23 | + } |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Register the module services. |
|
| 28 | - * |
|
| 29 | - * @return void |
|
| 30 | - */ |
|
| 31 | - public function register() |
|
| 32 | - { |
|
| 33 | - $this->app->register(RouteServiceProvider::class); |
|
| 34 | - } |
|
| 26 | + /** |
|
| 27 | + * Register the module services. |
|
| 28 | + * |
|
| 29 | + * @return void |
|
| 30 | + */ |
|
| 31 | + public function register() |
|
| 32 | + { |
|
| 33 | + $this->app->register(RouteServiceProvider::class); |
|
| 34 | + } |
|
| 35 | 35 | } |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app')); |
| 20 | 20 | $this->loadFactoriesFrom(module_path('reporting', 'Database/Factories', 'app')); |
| 21 | - if(!$this->app->configurationIsCached()) { |
|
| 21 | + if ( ! $this->app->configurationIsCached()) { |
|
| 22 | 22 | $this->loadConfigsFrom(module_path('reporting', 'Config', 'app')); |
| 23 | 23 | } |
| 24 | 24 | } |