From d32cf1120ebeca021ec4806742dd57389fed9359 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 8 Jul 2017 08:14:53 -0400 Subject: [PATCH] Fixed: Artist Delete, Track Delete when Artist Delete (#30) Fixed: Artist Delete, Track Delete when Artist Delete --- src/NzbDrone.Core/Music/TrackRepository.cs | 2 +- src/UI/Artist/Delete/DeleteArtistTemplate.hbs | 4 ++-- src/UI/Artist/Delete/DeleteArtistView.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core/Music/TrackRepository.cs b/src/NzbDrone.Core/Music/TrackRepository.cs index f4efe3ec6..b260056fe 100644 --- a/src/NzbDrone.Core/Music/TrackRepository.cs +++ b/src/NzbDrone.Core/Music/TrackRepository.cs @@ -48,7 +48,7 @@ namespace NzbDrone.Core.Music public List GetTracks(int artistId) { - return Query.Join(JoinType.Inner, s => s.Artist, (track, artist) => track.ArtistId == artist.Id).ToList(); + return Query.Where(s => s.ArtistId == artistId).ToList(); } public List GetTracks(int artistId, int albumId) diff --git a/src/UI/Artist/Delete/DeleteArtistTemplate.hbs b/src/UI/Artist/Delete/DeleteArtistTemplate.hbs index 5e13328b1..815140776 100644 --- a/src/UI/Artist/Delete/DeleteArtistTemplate.hbs +++ b/src/UI/Artist/Delete/DeleteArtistTemplate.hbs @@ -1,7 +1,7 @@
- {{episodeFileCount}} track files will be deleted + {{trackFileCount}} track files will be deleted
diff --git a/src/UI/Artist/Delete/DeleteArtistView.js b/src/UI/Artist/Delete/DeleteArtistView.js index de6640b5e..f71c1cfa8 100644 --- a/src/UI/Artist/Delete/DeleteArtistView.js +++ b/src/UI/Artist/Delete/DeleteArtistView.js @@ -2,7 +2,7 @@ var vent = require('vent'); var Marionette = require('marionette'); module.exports = Marionette.ItemView.extend({ - template : 'Series/Delete/DeleteSeriesTemplate', + template : 'Artist/Delete/DeleteArtistTemplate', events : { 'click .x-confirm-delete' : 'removeSeries',