diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 8a2063c6..27d41066 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -45,15 +45,13 @@ class ItemController extends Controller $data['categories'] = Item::whereHas('children')->with('children', function ($query) { $query->pinned()->orderBy('order', 'asc'); })->pinned()->orderBy('order', 'asc')->get(); - } elseif ($treat_tags_as == 'tags') { $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get(); $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get(); - $data['taglist'] = Item::where('id', 0)->orWhere(function($query) { + $data['taglist'] = Item::where('id', 0)->orWhere(function ($query) { $query->where('type', 1)->pinned(); })->orderBy('order', 'asc')->get(); } else { - $data['apps'] = Item::whereHas('parents', function ($query) { $query->where('id', 0); })->whereIn('role', $roles)->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get(); @@ -67,15 +65,13 @@ class ItemController extends Controller $data['categories'] = Item::whereHas('children')->with('children', function ($query) { $query->pinned()->orderBy('order', 'asc'); })->pinned()->orderBy('order', 'asc')->get(); - } elseif ($treat_tags_as == 'tags') { $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get(); $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get(); - $data['taglist'] = Item::where('id', 0)->orWhere(function($query) { + $data['taglist'] = Item::where('id', 0)->orWhere(function ($query) { $query->where('type', 1)->pinned(); })->orderBy('order', 'asc')->get(); } else { - $data['apps'] = Item::whereHas('parents', function ($query) { $query->where('id', 0); })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get(); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c44c21bb..08edb236 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -88,8 +88,8 @@ class AppServiceProvider extends ServiceProvider $view->with('trianglify_seed', $trianglify_seed); $view->with('allusers', $allusers); $view->with('current_user', $current_user); - if (config('app.auth_roles_enable')){ - $view->with('enable_auth_admin_controls', in_array(config('app.auth_roles_admin'),explode(config('app.auth_roles_delimiter'), $_SERVER[config('app.auth_roles_http_header')]))); + if (config('app.auth_roles_enable')) { + $view->with('enable_auth_admin_controls', in_array(config('app.auth_roles_admin'), explode(config('app.auth_roles_delimiter'), $_SERVER[config('app.auth_roles_http_header')]))); } else { $view->with('enable_auth_admin_controls', true); } diff --git a/database/seeders/SettingsSeeder.php b/database/seeders/SettingsSeeder.php index 9594d2fb..8618c526 100644 --- a/database/seeders/SettingsSeeder.php +++ b/database/seeders/SettingsSeeder.php @@ -349,6 +349,5 @@ class SettingsSeeder extends Seeder $setting->label = 'app.settings.treat_tags_as'; $setting->save(); } - } }