mirror of
				https://github.com/linuxserver/Heimdall.git
				synced 2025-10-31 21:17:44 +09:00 
			
		
		
		
	Apply code style
This commit is contained in:
		| @@ -45,15 +45,13 @@ class ItemController extends Controller | |||||||
|                 $data['categories'] = Item::whereHas('children')->with('children', function ($query) { |                 $data['categories'] = Item::whereHas('children')->with('children', function ($query) { | ||||||
|                     $query->pinned()->orderBy('order', 'asc'); |                     $query->pinned()->orderBy('order', 'asc'); | ||||||
|                 })->pinned()->orderBy('order', 'asc')->get(); |                 })->pinned()->orderBy('order', 'asc')->get(); | ||||||
|  |  | ||||||
|             } elseif ($treat_tags_as == 'tags') { |             } elseif ($treat_tags_as == 'tags') { | ||||||
|                 $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get(); |                 $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['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(); |                     $query->where('type', 1)->pinned(); | ||||||
|                 })->orderBy('order', 'asc')->get(); |                 })->orderBy('order', 'asc')->get(); | ||||||
|             } else { |             } else { | ||||||
|  |  | ||||||
|                 $data['apps'] = Item::whereHas('parents', function ($query) { |                 $data['apps'] = Item::whereHas('parents', function ($query) { | ||||||
|                     $query->where('id', 0); |                     $query->where('id', 0); | ||||||
|                 })->whereIn('role', $roles)->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get(); |                 })->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) { |                 $data['categories'] = Item::whereHas('children')->with('children', function ($query) { | ||||||
|                     $query->pinned()->orderBy('order', 'asc'); |                     $query->pinned()->orderBy('order', 'asc'); | ||||||
|                 })->pinned()->orderBy('order', 'asc')->get(); |                 })->pinned()->orderBy('order', 'asc')->get(); | ||||||
|  |  | ||||||
|             } elseif ($treat_tags_as == 'tags') { |             } elseif ($treat_tags_as == 'tags') { | ||||||
|                 $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get(); |                 $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['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(); |                     $query->where('type', 1)->pinned(); | ||||||
|                 })->orderBy('order', 'asc')->get(); |                 })->orderBy('order', 'asc')->get(); | ||||||
|             } else { |             } else { | ||||||
|  |  | ||||||
|                 $data['apps'] = Item::whereHas('parents', function ($query) { |                 $data['apps'] = Item::whereHas('parents', function ($query) { | ||||||
|                     $query->where('id', 0); |                     $query->where('id', 0); | ||||||
|                 })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get(); |                 })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get(); | ||||||
|   | |||||||
| @@ -88,8 +88,8 @@ class AppServiceProvider extends ServiceProvider | |||||||
|             $view->with('trianglify_seed', $trianglify_seed); |             $view->with('trianglify_seed', $trianglify_seed); | ||||||
|             $view->with('allusers', $allusers); |             $view->with('allusers', $allusers); | ||||||
|             $view->with('current_user', $current_user); |             $view->with('current_user', $current_user); | ||||||
|             if (config('app.auth_roles_enable')){ |             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')]))); |                 $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 { |             } else { | ||||||
|                 $view->with('enable_auth_admin_controls', true); |                 $view->with('enable_auth_admin_controls', true); | ||||||
|             } |             } | ||||||
|   | |||||||
| @@ -349,6 +349,5 @@ class SettingsSeeder extends Seeder | |||||||
|             $setting->label = 'app.settings.treat_tags_as'; |             $setting->label = 'app.settings.treat_tags_as'; | ||||||
|             $setting->save(); |             $setting->save(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user