diff --git a/app/Http/Controllers/ProgramQueryController.php b/app/Http/Controllers/ProgramQueryController.php index 94c48cd..c948cc3 100644 --- a/app/Http/Controllers/ProgramQueryController.php +++ b/app/Http/Controllers/ProgramQueryController.php @@ -10,7 +10,7 @@ class ProgramQueryController extends BaseController { public function index() { $keyword = request()->get("keyword", ""); - $programs = Programs::query()->with(["appends", "tags", "video_pivots.video"])->limit(15)->orderByDesc("created_at")->get(); + $programs = Programs::query()->with(["appends", "tag_pivots.tag", "video_pivots.video"])->limit(15)->orderByDesc("created_at")->get(); return view("program", [ "keyword" => $keyword, "programs"=>$programs, diff --git a/app/Models/Programs.php b/app/Models/Programs.php index 2a8c624..df09b95 100644 --- a/app/Models/Programs.php +++ b/app/Models/Programs.php @@ -11,6 +11,11 @@ class Programs extends Model return $this->hasMany(ProgramAppends::class, "program_id", "id")->orderByDesc("is_original"); } + public function tag_pivots(): \Illuminate\Database\Eloquent\Relations\HasMany + { + return $this->hasMany(ProgramTags::class, "program_id", "id")->orderBy("id"); + } + public function tags(): \Illuminate\Database\Eloquent\Relations\HasManyThrough { return $this->hasManyThrough(Tags::class, ProgramTags::class, "program_id", "id", "id", "tag_id"); diff --git a/resources/views/program.blade.php b/resources/views/program.blade.php index 2e48f98..9ec0bf3 100644 --- a/resources/views/program.blade.php +++ b/resources/views/program.blade.php @@ -26,8 +26,8 @@