linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2026-02-21 12:10:34 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed some rebase conflicts

Browse Source
This commit is contained in:
Tobias Kolzer
2024-06-21 01:12:58 +02:00
committed by knom
parent d146fed320
commit 921631bdcd
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ItemController.php
View File

@@ -40,7 +40,7 @@ class ItemController extends Controller
$data["treat_tags_as"] = $treat_tags_as;
if (config('app.auth_roles_enable')) {
$roles = explode(',', $request->header(config('app.auth_roles_header')));
$roles = explode(config('app.auth_roles_delimiter'), $request->header(config('app.auth_roles_header')));
if ($treat_tags_as == 'categories') {
$data['categories'] = Item::whereHas('children')->with('children', function ($query) {
$query->pinned()->orderBy('order', 'asc');

2
app/Http/Controllers/TagController.php
View File

@@ -93,7 +93,7 @@ class TagController extends Controller
$item = Item::whereUrl($slug)->first();
//print_r($item);
if (config('app.auth_roles_enable')) {
$roles = explode(',', $request->header(config('app.auth_roles_header')));
$roles = explode(config('app.auth_roles_delimiter'), $request->header(config('app.auth_roles_header')));
$data['apps'] = $item->children()->whereIn('role', $roles)->pinned()->orderBy('order', 'asc')->get();
} else {
$data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();

5
app/Providers/AppServiceProvider.php
View File

@@ -88,6 +88,11 @@ 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_config_buttons', in_array(config('app.auth_roles_admin'),explode(config('app.auth_roles_delimiter'), $_SERVER[config('app.auth_roles_http_header')])));
} else {
$view->with('enable_config_buttons', true);
}
});
$this->app['view']->addNamespace('SupportedApps', app_path('SupportedApps'));

2
config/app.php
View File

@@ -194,6 +194,8 @@ return [
'auth_roles_enable' => (bool) env('AUTH_ROLES_ENABLE', false),
'auth_roles_header' => env('AUTH_ROLES_HEADER', 'remote-groups'),
'auth_roles_http_header' => env('AUTH_ROLES_HTTP_HEADER', 'HTTP_REMOTE_GROUPS'),
'auth_roles_admin' => env('AUTH_ROLES_ADMIN', 'admin'),
'auth_roles_delimiter' => ',',
];

4
resources/views/layouts/app.blade.php
View File

@@ -94,9 +94,8 @@
</div>
@endif
@yield('content')
@if($enable_config_buttons)
<div id="config-buttons">
@if(Route::is('dash') || Route::is('tags.show'))
<a id="config-button" class="config" href=""><i class="fas fa-exchange"></i><div class="tooltip left">{{ __('app.dashboard.reorder') }}</div></a>
@@ -110,6 +109,7 @@
<a id="folder" class="config" href="{{ route('tags.index', []) }}"><i class="fas fa-tag"></i><div class="tooltip left">{{ __('app.apps.tag_list') }}</div></a>
<a id="settings" class="config" href="{{ route('settings.index', []) }}"><i class="fas fa-cogs"></i><div class="tooltip left">{{ __('app.dashboard.settings') }}</div></a>
</div>
@endif
</main>
</div>