From 7a209fc67df4611d430705a9788d2b74c184b320 Mon Sep 17 00:00:00 2001 From: sharkykh Date: Sat, 28 Jul 2018 17:28:25 +0300 Subject: [PATCH] Fix incorrect identifier on `changeEpisodeStatuses` Fixes #4776 --- medusa/server/web/manage/handler.py | 10 ++++++++-- themes-default/slim/static/js/manage/init.js | 2 +- themes/dark/assets/js/manage/init.js | 2 +- themes/dark/assets/js/manage/init.js.map | 2 +- themes/light/assets/js/manage/init.js | 2 +- themes/light/assets/js/manage/init.js.map | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/medusa/server/web/manage/handler.py b/medusa/server/web/manage/handler.py index d4256f9f50..d1b97007c2 100644 --- a/medusa/server/web/manage/handler.py +++ b/medusa/server/web/manage/handler.py @@ -170,10 +170,16 @@ def changeEpisodeStatuses(self, oldStatus, newStatus, *args, **kwargs): status_list + [cur_indexer_id, cur_series_id] ) - all_eps = ['{season}x{episode}'.format(season=x[b'season'], episode=x[b'episode']) for x in all_eps_results] + all_eps = ['s{season}e{episode}'.format(season=x[b'season'], episode=x[b'episode']) for x in all_eps_results] to_change[cur_indexer_id, cur_series_id] = all_eps - self.setStatus(indexer_id_to_name(int(cur_indexer_id)), cur_series_id, '|'.join(to_change[(cur_indexer_id, cur_series_id)]), newStatus, direct=True) + self.setStatus( + indexername=indexer_id_to_name(int(cur_indexer_id)), + seriesid=cur_series_id, + eps='|'.join(to_change[(cur_indexer_id, cur_series_id)]), + status=newStatus, + direct=True + ) return self.redirect('/manage/episodeStatuses/') diff --git a/themes-default/slim/static/js/manage/init.js b/themes-default/slim/static/js/manage/init.js index ae2631236f..9a8fd09bc1 100644 --- a/themes-default/slim/static/js/manage/init.js +++ b/themes-default/slim/static/js/manage/init.js @@ -4,7 +4,7 @@ MEDUSA.manage.init = function() { const series = indexerId + '-' + seriesId; row += ' '; - row += ' '; + row += ' '; row += ' ' + season + 'x' + episode + ''; row += ' ' + name + ''; row += ' '; diff --git a/themes/dark/assets/js/manage/init.js b/themes/dark/assets/js/manage/init.js index ae2631236f..9a8fd09bc1 100644 --- a/themes/dark/assets/js/manage/init.js +++ b/themes/dark/assets/js/manage/init.js @@ -4,7 +4,7 @@ MEDUSA.manage.init = function() { const series = indexerId + '-' + seriesId; row += ' '; - row += ' '; + row += ' '; row += ' ' + season + 'x' + episode + ''; row += ' ' + name + ''; row += ' '; diff --git a/themes/dark/assets/js/manage/init.js.map b/themes/dark/assets/js/manage/init.js.map index 7740f91baf..1bed467529 100644 --- a/themes/dark/assets/js/manage/init.js.map +++ b/themes/dark/assets/js/manage/init.js.map @@ -1 +1 @@ -{"version":3,"names":[],"mappings":"","sources":["js/manage/init.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i';\n row += ' ';\n row += ' ' + season + 'x' + episode + '';\n row += ' ' + name + '';\n row += ' ';\n\n return row;\n };\n\n $.makeSubtitleRow = function (indexerId, seriesId, season, episode, name, subtitles, checked) {\n // eslint-disable-line max-params\n var row = '';\n var series = indexerId + '-' + seriesId;\n\n row += '';\n row += '';\n row += '' + season + 'x' + episode + '';\n if (subtitles.length > 0) {\n row += '';\n subtitles = subtitles.split(',');\n for (var i in subtitles) {\n if ({}.hasOwnProperty.call(subtitles, i)) {\n row += '\"' ';\n }\n }\n row += '';\n } else {\n row += 'No subtitles';\n }\n row += '' + name + '';\n row += '';\n\n return row;\n };\n};\n\n},{}]},{},[1]);\n"],"file":"init.js"} \ No newline at end of file +{"version":3,"names":[],"mappings":"","sources":["js/manage/init.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i';\n row += ' ';\n row += ' ' + season + 'x' + episode + '';\n row += ' ' + name + '';\n row += ' ';\n\n return row;\n };\n\n $.makeSubtitleRow = function (indexerId, seriesId, season, episode, name, subtitles, checked) {\n // eslint-disable-line max-params\n var row = '';\n var series = indexerId + '-' + seriesId;\n\n row += '';\n row += '';\n row += '' + season + 'x' + episode + '';\n if (subtitles.length > 0) {\n row += '';\n subtitles = subtitles.split(',');\n for (var i in subtitles) {\n if ({}.hasOwnProperty.call(subtitles, i)) {\n row += '\"' ';\n }\n }\n row += '';\n } else {\n row += 'No subtitles';\n }\n row += '' + name + '';\n row += '';\n\n return row;\n };\n};\n\n},{}]},{},[1]);\n"],"file":"init.js"} \ No newline at end of file diff --git a/themes/light/assets/js/manage/init.js b/themes/light/assets/js/manage/init.js index ae2631236f..9a8fd09bc1 100644 --- a/themes/light/assets/js/manage/init.js +++ b/themes/light/assets/js/manage/init.js @@ -4,7 +4,7 @@ MEDUSA.manage.init = function() { const series = indexerId + '-' + seriesId; row += ' '; - row += ' '; + row += ' '; row += ' ' + season + 'x' + episode + ''; row += ' ' + name + ''; row += ' '; diff --git a/themes/light/assets/js/manage/init.js.map b/themes/light/assets/js/manage/init.js.map index 7740f91baf..1bed467529 100644 --- a/themes/light/assets/js/manage/init.js.map +++ b/themes/light/assets/js/manage/init.js.map @@ -1 +1 @@ -{"version":3,"names":[],"mappings":"","sources":["js/manage/init.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i';\n row += ' ';\n row += ' ' + season + 'x' + episode + '';\n row += ' ' + name + '';\n row += ' ';\n\n return row;\n };\n\n $.makeSubtitleRow = function (indexerId, seriesId, season, episode, name, subtitles, checked) {\n // eslint-disable-line max-params\n var row = '';\n var series = indexerId + '-' + seriesId;\n\n row += '';\n row += '';\n row += '' + season + 'x' + episode + '';\n if (subtitles.length > 0) {\n row += '';\n subtitles = subtitles.split(',');\n for (var i in subtitles) {\n if ({}.hasOwnProperty.call(subtitles, i)) {\n row += '\"' ';\n }\n }\n row += '';\n } else {\n row += 'No subtitles';\n }\n row += '' + name + '';\n row += '';\n\n return row;\n };\n};\n\n},{}]},{},[1]);\n"],"file":"init.js"} \ No newline at end of file +{"version":3,"names":[],"mappings":"","sources":["js/manage/init.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i';\n row += ' ';\n row += ' ' + season + 'x' + episode + '';\n row += ' ' + name + '';\n row += ' ';\n\n return row;\n };\n\n $.makeSubtitleRow = function (indexerId, seriesId, season, episode, name, subtitles, checked) {\n // eslint-disable-line max-params\n var row = '';\n var series = indexerId + '-' + seriesId;\n\n row += '';\n row += '';\n row += '' + season + 'x' + episode + '';\n if (subtitles.length > 0) {\n row += '';\n subtitles = subtitles.split(',');\n for (var i in subtitles) {\n if ({}.hasOwnProperty.call(subtitles, i)) {\n row += '\"' ';\n }\n }\n row += '';\n } else {\n row += 'No subtitles';\n }\n row += '' + name + '';\n row += '';\n\n return row;\n };\n};\n\n},{}]},{},[1]);\n"],"file":"init.js"} \ No newline at end of file