fix
This commit is contained in:
@@ -33,14 +33,14 @@ public function index(Request $request)
|
|||||||
$query->with('subcategories');
|
$query->with('subcategories');
|
||||||
}
|
}
|
||||||
|
|
||||||
$categories = $query->orderBy('name')->get();
|
$categories = $query->orderBy('order')->orderBy('name')->get();
|
||||||
|
|
||||||
// No type filter → also fold in the playlist (music) categories so the
|
// No type filter → also fold in the playlist (music) categories so the
|
||||||
// response contains every category across both tables.
|
// response contains every category across both tables.
|
||||||
if (!$request->filled('type')) {
|
if (!$request->filled('type')) {
|
||||||
$categories = $categories
|
$categories = $categories
|
||||||
->concat($this->playlistCategories($request))
|
->concat($this->playlistCategories($request))
|
||||||
->sortBy('name')
|
->sortBy([['order', 'asc'], ['name', 'asc']])
|
||||||
->values();
|
->values();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +88,7 @@ public function store(Request $request)
|
|||||||
Rule::unique('categories', 'name')->where('type', $request->input('type', Category::TYPE_MEDIA)),
|
Rule::unique('categories', 'name')->where('type', $request->input('type', Category::TYPE_MEDIA)),
|
||||||
],
|
],
|
||||||
'type' => ['nullable', Rule::in(Category::TYPES)],
|
'type' => ['nullable', Rule::in(Category::TYPES)],
|
||||||
|
'order' => 'nullable|integer',
|
||||||
'description' => 'nullable|string',
|
'description' => 'nullable|string',
|
||||||
'icon' => 'nullable|file|extensions:jpg,jpeg,png,gif,webp,bmp,svg|max:8192',
|
'icon' => 'nullable|file|extensions:jpg,jpeg,png,gif,webp,bmp,svg|max:8192',
|
||||||
]);
|
]);
|
||||||
@@ -95,6 +96,7 @@ public function store(Request $request)
|
|||||||
$category = Category::create([
|
$category = Category::create([
|
||||||
'name' => $data['name'],
|
'name' => $data['name'],
|
||||||
'type' => $data['type'] ?? Category::TYPE_MEDIA,
|
'type' => $data['type'] ?? Category::TYPE_MEDIA,
|
||||||
|
'order' => $data['order'] ?? 0,
|
||||||
'description' => $data['description'] ?? null,
|
'description' => $data['description'] ?? null,
|
||||||
'icon' => $request->hasFile('icon')
|
'icon' => $request->hasFile('icon')
|
||||||
? $this->storeUpload($request->file('icon'), 'categories/icons')
|
? $this->storeUpload($request->file('icon'), 'categories/icons')
|
||||||
@@ -158,6 +160,7 @@ public function update(Request $request, $id)
|
|||||||
->ignore($category->id),
|
->ignore($category->id),
|
||||||
],
|
],
|
||||||
'type' => ['nullable', Rule::in(Category::TYPES)],
|
'type' => ['nullable', Rule::in(Category::TYPES)],
|
||||||
|
'order' => 'nullable|integer',
|
||||||
'description' => 'nullable|string',
|
'description' => 'nullable|string',
|
||||||
'icon' => 'nullable|file|extensions:jpg,jpeg,png,gif,webp,bmp,svg|max:8192',
|
'icon' => 'nullable|file|extensions:jpg,jpeg,png,gif,webp,bmp,svg|max:8192',
|
||||||
]);
|
]);
|
||||||
@@ -165,6 +168,9 @@ public function update(Request $request, $id)
|
|||||||
if (array_key_exists('type', $data) && $data['type'] !== null) {
|
if (array_key_exists('type', $data) && $data['type'] !== null) {
|
||||||
$category->type = $data['type'];
|
$category->type = $data['type'];
|
||||||
}
|
}
|
||||||
|
if (array_key_exists('order', $data) && $data['order'] !== null) {
|
||||||
|
$category->order = $data['order'];
|
||||||
|
}
|
||||||
if (array_key_exists('name', $data)) {
|
if (array_key_exists('name', $data)) {
|
||||||
$category->name = $data['name'];
|
$category->name = $data['name'];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,11 @@ class Category extends Model
|
|||||||
self::TYPE_BREATHING_TEMPLATE,
|
self::TYPE_BREATHING_TEMPLATE,
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $fillable = ['name', 'type', 'description', 'icon'];
|
protected $fillable = ['name', 'type', 'order', 'description', 'icon'];
|
||||||
|
|
||||||
|
protected $casts = [
|
||||||
|
'order' => 'integer',
|
||||||
|
];
|
||||||
|
|
||||||
protected $appends = ['icon_url'];
|
protected $appends = ['icon_url'];
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('categories', function (Blueprint $table) {
|
||||||
|
$table->integer('order')->default(0)->after('type')->index();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('categories', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('order');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user