github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 21:43:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Artist Delete, Track Delete when Artist Delete (#30)

Browse source 
Fixed: Artist Delete, Track Delete when Artist Delete
This commit is contained in:
Qstick 2017-07-08 08:14:53 -04:00 • committed by Joseph Milazzo
commit d32cf1120e
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Core/Music/TrackRepository.cs
View file

@ -48,7 +48,7 @@ namespace NzbDrone.Core.Music
public List<Track> GetTracks(int artistId) public List<Track> GetTracks(int artistId)
{ {
return Query.Join<Track, Artist>(JoinType.Inner, s => s.Artist, (track, artist) => track.ArtistId == artist.Id).ToList(); return Query.Where(s => s.ArtistId == artistId).ToList();
} }
public List<Track> GetTracks(int artistId, int albumId) public List<Track> GetTracks(int artistId, int albumId)

4
src/UI/Artist/Delete/DeleteArtistTemplate.hbs
View file

@ -1,7 +1,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete {{title}}</h3> <h3>Delete {{name}}</h3>
</div> </div>
<div class="modal-body delete-artist-modal"> <div class="modal-body delete-artist-modal">
@ -36,7 +36,7 @@
</div> </div>
</div> </div>
<div class="col-md-offset-1 col-md-5 delete-files-info x-delete-files-info"> <div class="col-md-offset-1 col-md-5 delete-files-info x-delete-files-info">
{{episodeFileCount}} track files will be deleted {{trackFileCount}} track files will be deleted
</div> </div>
</div> </div>
</div> </div>

2
src/UI/Artist/Delete/DeleteArtistView.js
View file

@ -2,7 +2,7 @@ var vent = require('vent');
var Marionette = require('marionette'); var Marionette = require('marionette');
module.exports = Marionette.ItemView.extend({ module.exports = Marionette.ItemView.extend({
template : 'Series/Delete/DeleteSeriesTemplate', template : 'Artist/Delete/DeleteArtistTemplate',
events : { events : {
'click .x-confirm-delete' : 'removeSeries', 'click .x-confirm-delete' : 'removeSeries',