From 7661734ed296654630f3668132671117519145dd Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Thu, 15 Oct 2020 10:06:11 +0000
Subject: [PATCH] fix: add where condition to get episode count without deleted
episodes
contain podcast page header info within an md width
fixes #67
---
app/Models/EpisodeModel.php | 7 ++++++-
app/Views/podcast.php | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/Models/EpisodeModel.php b/app/Models/EpisodeModel.php
index 95ca8abb71..1bd2440b23 100644
--- a/app/Models/EpisodeModel.php
+++ b/app/Models/EpisodeModel.php
@@ -199,7 +199,11 @@ class EpisodeModel extends Model
$found = $this->select(
'YEAR(published_at) as year, count(*) as number_of_episodes'
)
- ->where(['podcast_id' => $podcastId, 'season_number' => null])
+ ->where([
+ 'podcast_id' => $podcastId,
+ 'season_number' => null,
+ $this->deletedField => null,
+ ])
->groupBy('year')
->orderBy('year', 'DESC')
->get()
@@ -220,6 +224,7 @@ class EpisodeModel extends Model
->where([
'podcast_id' => $podcastId,
'season_number is not' => null,
+ $this->deletedField => null,
])
->groupBy('season_number')
->orderBy('season_number', 'ASC')
diff --git a/app/Views/podcast.php b/app/Views/podcast.php
index f64a215783..e2f6fa7b20 100644
--- a/app/Views/podcast.php
+++ b/app/Views/podcast.php
@@ -21,7 +21,7 @@
<div class="flex flex-col items-center justify-center md:items-stretch md:mx-auto md:container md:py-12 md:flex-row ">
<img src="<?= $podcast->image->medium_url ?>"
alt="<?= $podcast->title ?>" class="object-cover w-full max-w-xs m-4 rounded-lg shadow-xl" />
- <div class="w-full p-4 bg-white md:w-auto md:text-white md:bg-transparent">
+ <div class="bg-white w-fullp-4 md:max-w-md md:text-white md:bg-transparent">
<h1 class="text-2xl font-semibold leading-tight"><?= $podcast->title ?> <span class="text-lg font-normal opacity-75">@<?= $podcast->name ?></span></h1>
<div class="flex items-center mb-4">
<address>
--
GitLab