monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issues introduced by adding Anime options to the Add Show flow.

Browse source 
Fix error page when clicking "Add Recommended".
Remove failed Anime options from "Add Existing Show".
This commit is contained in:
JackDandy 2015-03-10 02:29:52 +00:00
parent c53a7be7ad
commit c014bebb8c
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -1,3 +1,9 @@
### 0.7.1 (2015-03-10 17:00:00 UTC)
* Fix error page when clicking "Add Recommended"
* Remove failed Anime options from "Add Existing Show"
### 0.7.0 (2015-03-04 06:00:00 UTC) ### 0.7.0 (2015-03-04 06:00:00 UTC)
* Fix slow database operations (port from midgetspy/sickbeard) * Fix slow database operations (port from midgetspy/sickbeard)

8
gui/slick/interfaces/default/inc_addShowOptions.tmpl
View file

@ -59,6 +59,7 @@
</div> </div>
#end if #end if
#if $enable_anime_options
<div class="field-pair alt"> <div class="field-pair alt">
<label for="anime"> <label for="anime">
<span class="component-title">Show is anime</span> <span class="component-title">Show is anime</span>
@ -69,6 +70,7 @@
</label> </label>
</div> </div>
#end if
<div class="field-pair alt" style="margin-top:20px"> <div class="field-pair alt" style="margin-top:20px">
<label for="saveDefaultsButton"> <label for="saveDefaultsButton">
<span class="component-title">Save options as defaults</span> <span class="component-title">Save options as defaults</span>
@ -79,5 +81,9 @@
</label> </label>
</div> </div>
#if $enable_anime_options
#import sickbeard.blackandwhitelist #import sickbeard.blackandwhitelist
#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_blackwhitelist.tmpl') #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_blackwhitelist.tmpl')
#else
<input type="hidden" name="anime" id="anime" value="0" />
#end if

6
sickbeard/webserve.py
View file

@ -2809,6 +2809,7 @@ class NewHomeAddShows(MainHandler):
t = PageTemplate(headers=self.request.headers, file="home_newShow.tmpl") t = PageTemplate(headers=self.request.headers, file="home_newShow.tmpl")
t.submenu = HomeMenu() t.submenu = HomeMenu()
t.enable_anime_options = True
indexer, show_dir, indexer_id, show_name = self.split_extra_show(show_to_add) indexer, show_dir, indexer_id, show_name = self.split_extra_show(show_to_add)
@ -2861,6 +2862,7 @@ class NewHomeAddShows(MainHandler):
t = PageTemplate(headers=self.request.headers, file="home_recommendedShows.tmpl") t = PageTemplate(headers=self.request.headers, file="home_recommendedShows.tmpl")
t.submenu = HomeMenu() t.submenu = HomeMenu()
t.enable_anime_options = False
return _munge(t) return _munge(t)
@ -2947,9 +2949,7 @@ class NewHomeAddShows(MainHandler):
""" """
t = PageTemplate(headers=self.request.headers, file="home_addExistingShow.tmpl") t = PageTemplate(headers=self.request.headers, file="home_addExistingShow.tmpl")
t.submenu = HomeMenu() t.submenu = HomeMenu()
t.whitelist = [] t.enable_anime_options = False
t.blacklist = []
t.groups = []
return _munge(t) return _munge(t)