|
@@ -107,15 +107,21 @@ class User extends Model implements AuthenticatableContract
|
|
|
*/
|
|
|
|
|
|
public function showPermissions($showApp = '') {
|
|
|
- $appModules = Modules::getAppModules();
|
|
|
- if(!is_null($appModules) && $showApp) {
|
|
|
- $hiddenAppModuleNames = $appModules->reject(function ($module) use ($showApp) {
|
|
|
- $apps = explode(',', $showApp);
|
|
|
- return in_array($module['name'], $apps);
|
|
|
- })->pluck('name');
|
|
|
- } else {
|
|
|
- $hiddenAppModuleNames = collect();
|
|
|
+ $hiddenAppModuleNames = collect();
|
|
|
+ if($this->roles->pluck('identify')->contains('optimizer')) {
|
|
|
+ $appModules = Modules::getAppModules();
|
|
|
+ if(!is_null($appModules)) {
|
|
|
+ $hiddenAppModuleNames = $appModules->pluck('name');
|
|
|
+ if($showApp) {
|
|
|
+ $hiddenAppModuleNames = $appModules->reject(function ($module) use ($showApp) {
|
|
|
+ $apps = explode(',', $showApp);
|
|
|
+ return in_array($module['name'], $apps);
|
|
|
+ })->pluck('name');
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
$enablePermissions = $this->getAttribute('permissions')->reject(function ($permission) use ($hiddenAppModuleNames){
|
|
|
return $hiddenAppModuleNames->contains($permission['module']);
|
|
|
})->values()->all();
|