lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 12:07:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Setting::get()

Browse Source
This commit is contained in:
xiaomlove
2022-02-21 22:57:06 +08:00
parent 02590540e7
commit 4d82f5cffa
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TorrentController.php
+2 -1
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Resources\TorrentResource; use App\Http\Resources\TorrentResource;
use App\Models\Setting;
use App\Models\Torrent; use App\Models\Torrent;
use App\Repositories\TorrentRepository; use App\Repositories\TorrentRepository;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -21,7 +22,7 @@ class TorrentController extends Controller
{ {
$params = $request->all(); $params = $request->all();
$params['visible'] = Torrent::VISIBLE_YES; $params['visible'] = Torrent::VISIBLE_YES;
$params['category_mode'] = get_setting('main.browsecat'); $params['category_mode'] = Setting::get('main.browsecat');
$result = $this->repository->getList($params); $result = $this->repository->getList($params);
$resource = TorrentResource::collection($result); $resource = TorrentResource::collection($result);
$resource->additional([ $resource->additional([
app/Models/Setting.php
+5 -3
View File
@@ -15,9 +15,11 @@ class Setting extends NexusModel
$rows = self::query()->get(['name', 'value']); $rows = self::query()->get(['name', 'value']);
foreach ($rows as $row) { foreach ($rows as $row) {
$value = $row->value; $value = $row->value;
$arr = json_decode($value, true); if (!is_null($value)) {
if (is_array($arr)) { $arr = json_decode($value, true);
$value = $arr; if (is_array($arr)) {
$value = $arr;
}
} }
Arr::set($settings, $row->name, $value); Arr::set($settings, $row->name, $value);
} }