fix: sort episodes by published_at with unpublished episodes at the begining

set the right permissions for episode's publication date edit

fixes #249
This commit is contained in:
Yassine Doghri 2022-10-18 17:25:49 +00:00
parent d0836f3ee3
commit 1686f840d1
3 changed files with 5 additions and 2 deletions

View File

@ -333,7 +333,7 @@ $routes->group(
[ [
'as' => 'episode-publish_date_edit', 'as' => 'episode-publish_date_edit',
'filter' => 'filter' =>
'permission:podcast-manage_publications', 'permission:podcast#.episodes.manage-publications',
], ],
); );
$routes->post( $routes->post(
@ -341,7 +341,7 @@ $routes->group(
'EpisodeController::attemptPublishDateEdit/$1/$2', 'EpisodeController::attemptPublishDateEdit/$1/$2',
[ [
'filter' => 'filter' =>
'permission:podcast-manage_publications', 'permission:podcast#.episodes.manage-publications',
], ],
); );
$routes->get( $routes->get(

View File

@ -74,6 +74,7 @@ class EpisodeController extends BaseController
->where('podcast_id', $this->podcast->id) ->where('podcast_id', $this->podcast->id)
->like('title', $query) ->like('title', $query)
->orLike('description_markdown', $query) ->orLike('description_markdown', $query)
->orderBy('-`published_at`', '', false)
->orderBy('created_at', 'desc'); ->orderBy('created_at', 'desc');
} else { } else {
$episodes = (new EpisodeModel()) $episodes = (new EpisodeModel())
@ -83,6 +84,7 @@ class EpisodeController extends BaseController
} else { } else {
$episodes = (new EpisodeModel()) $episodes = (new EpisodeModel())
->where('podcast_id', $this->podcast->id) ->where('podcast_id', $this->podcast->id)
->orderBy('-`published_at`', '', false)
->orderBy('created_at', 'desc'); ->orderBy('created_at', 'desc');
} }

View File

@ -422,6 +422,7 @@ class PodcastController extends BaseController
{ {
$episodes = (new EpisodeModel()) $episodes = (new EpisodeModel())
->where('podcast_id', $podcastId) ->where('podcast_id', $podcastId)
->orderBy('-`published_at`', '', false)
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->findAll($limit); ->findAll($limit);