linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2025-11-09 01:12:40 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #371 Tagged items when pinning/unpinning (#1036)

Browse Source
This commit is contained in:
KodeStar
2022-11-25 23:21:45 +00:00
committed by GitHub
parent 7565bd4028
commit aa49a5fb42
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,12 +106,20 @@ class ItemController extends Controller
$item->pinned = $new; $item->pinned = $new;
$item->save(); $item->save();
if ($ajax) { if ($ajax) {
if (is_numeric($tag) && $tag > 0) {
$item = Item::whereId($tag)->first(); $item = Item::whereId($tag)->first();
$data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
} else { $data['apps'] = new \Illuminate\Database\Eloquent\Collection;
$data['apps'] = Item::pinned()->orderBy('order', 'asc')->get();
if ((int)$tag === 0) {
$tags = Item::where('type', 1)->pinned()->orderBy('order', 'asc')->get();
$data['apps'] = $data['apps']->merge($tags);
} }
$apps = $item->children()->pinned()->orderBy('order', 'asc')->get();
$data['apps'] = $data['apps']->merge($apps);
$data['ajax'] = true; $data['ajax'] = true;
return view('sortable', $data); return view('sortable', $data);
@@ -410,7 +418,8 @@ class ItemController extends Controller
$app = $single->class; $app = $single->class;
// If password is not resubmitted fill it from the database when in edit mode // If password is not resubmitted fill it from the database when in edit mode
if (array_key_exists('password', $data) && if (
array_key_exists('password', $data) &&
$data['password'] === null && $data['password'] === null &&
array_key_exists('id', $data) array_key_exists('id', $data)
) { ) {

2
config/app.php
View File

@@ -14,7 +14,7 @@ return [
*/ */
'name' => env('APP_NAME', 'Heimdall'), 'name' => env('APP_NAME', 'Heimdall'),
'version' => '2.5.2', 'version' => '2.5.3',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------