Fix js resetting the scene (1x1) column

pymedusa · Mar 8, 2016 · c7f7600 · c7f7600
1 parent 1f901f5
commit c7f7600
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/gui/slick/js/core.js b/gui/slick/js/core.js
@@ -2349,9 +2349,17 @@ var SICKRAGE = {
 
             $('.sceneSeasonXEpisode').on('change', function() {
                 // Strip non-numeric characters
-                $(this).val($(this).val().replace(/[^0-9xX]*/g, ''));
+                var value = $(this).val();
+                $(this).val(value.replace(/[^0-9xX]*/g, ''));
                 var forSeason = $(this).attr('data-for-season');
                 var forEpisode = $(this).attr('data-for-episode');
+
+                // If empty reset the field
+                if (value === '') {
+                    setEpisodeSceneNumbering(forSeason, forEpisode, null, null);
+                    return;
+                }
+
                 var m = $(this).val().match(/^(\d+)x(\d+)$/i);
                 var onlyEpisode = $(this).val().match(/^(\d+)$/i);
                 var sceneSeason = null, sceneEpisode = null;
@@ -2368,10 +2376,11 @@ var SICKRAGE = {
                 } else {
                     isValid = setInputValidInvalid(false, $(this));
                 }
-                // Only perform the request when there is a valid input
+
                 if (isValid){
                     setEpisodeSceneNumbering(forSeason, forEpisode, sceneSeason, sceneEpisode);
                 }
+
             });
 
             $('.sceneAbsolute').on('change', function() {

diff --git a/gui/slick/js/core.min.js b/gui/slick/js/core.min.js
diff --git a/gui/slick/views/displayShow.mako b/gui/slick/views/displayShow.mako
@@ -425,7 +425,7 @@
                 <input type="text" placeholder="${str(dfltSeas) + 'x' + str(dfltEpis)}" size="6" maxlength="8"
                     class="sceneSeasonXEpisode form-control input-scene" data-for-season="${epResult["season"]}" data-for-episode="${epResult["episode"]}"
                     id="sceneSeasonXEpisode_${show.indexerid}_${str(epResult["season"])}_${str(epResult["episode"])}"
-                    title="Change the value here if scene numbering differs from the indexer episode numbering"
+                    title="Change the value here if scene numbering differs from the indexer episode numbering. General used for non-anime shows!"
                     % if dfltEpNumbering:
                         value=""
                     % else:
@@ -437,7 +437,8 @@
                 <input type="text" placeholder="${str(dfltAbsolute)}" size="6" maxlength="8"
                     class="sceneAbsolute form-control input-scene" data-for-absolute="${epResult["absolute_number"]}"
                     id="sceneAbsolute_${show.indexerid}${"_"+str(epResult["absolute_number"])}"
-                    title="Change the value here if scene absolute numbering differs from the indexer absolute numbering"
+                    title="Change the value here if scene absolute numbering differs from the indexer absolute numbering. 
+                    General used for Anime shows!"
                     % if dfltAbsNumbering:
                         value=""
                     % else:

diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
@@ -2112,7 +2112,17 @@ def setSceneNumbering(self, show, indexer, forSeason=None, forEpisode=None, forA
 
         showObj = Show.find(sickbeard.showList, int(show))
 
-        if showObj.is_anime:
+        # Check if this is an anime, because we can't set the Scene numbering for anime shows
+        if showObj.is_anime and not forAbsolute:
+            result = {
+                'success': False,
+                'errorMessage': 'You can\'t use the Scene numbering for anime shows. ' +
+                'Use the Scene Absolute field, to configure a diverging episode number.',
+                'sceneSeason': None,
+                'sceneAbsolute': None
+            }
+            return json.dumps(result)
+        elif showObj.is_anime:
             result = {
                 'success': True,
                 'forAbsolute': forAbsolute,