linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2026-02-21 20:20: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();