Merge remote-tracking branch 'origin/develop' into develop

Leonardo Galli 8 years ago
commit 98b6932ffe

@ -41,7 +41,7 @@ namespace NzbDrone.Core.Notifications.Xbmc
var parameters = new Dictionary<string, object>(); var parameters = new Dictionary<string, object>();
parameters.Add("title", title); parameters.Add("title", title);
parameters.Add("message", message); parameters.Add("message", message);
parameters.Add("image", "https://raw.github.com/Sonarr/Sonarr/develop/Logo/64.png"); parameters.Add("image", "https://raw.github.com/Radarr/Radarr/develop/Logo/64.png");
parameters.Add("displaytime", settings.DisplayTime * 1000); parameters.Add("displaytime", settings.DisplayTime * 1000);
ProcessRequest(request, settings, "GUI.ShowNotification", parameters); ProcessRequest(request, settings, "GUI.ShowNotification", parameters);

@ -52,7 +52,6 @@ module.exports = Marionette.ItemView.extend({
this.listenTo(FullMovieCollection, 'save', function() { this.listenTo(FullMovieCollection, 'save', function() {
window.alert(' Done Saving'); window.alert(' Done Saving');
var selected = FullMovieCollection.where({ selected : true }); var selected = FullMovieCollection.where({ selected : true });
}); });
@ -177,7 +176,7 @@ module.exports = Marionette.ItemView.extend({
}, },
_organizeFiles : function() { _organizeFiles : function() {
var selected = this.editorGrid.getSelectedModels(); var selected = FullMovieCollection.where({ selected : true });
var updateFilesMoviesView = new UpdateFilesMoviesView({ movies : selected }); var updateFilesMoviesView = new UpdateFilesMoviesView({ movies : selected });
this.listenToOnce(updateFilesMoviesView, 'updatingFiles', this._afterSave); this.listenToOnce(updateFilesMoviesView, 'updatingFiles', this._afterSave);

Loading…
Cancel
Save