monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-02 17:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
JackDandy 2018-05-17 04:39:52 +01:00
commit 531491f30c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -16,6 +16,11 @@
### 0.16.8 (2018-05-17 02:00:00 UTC)
* Fix changing master id via search method
### 0.16.7 (2018-05-14 02:40:00 UTC) ### 0.16.7 (2018-05-14 02:40:00 UTC)
* Fix name_parser_tests for test_extra_info_no_name * Fix name_parser_tests for test_extra_info_no_name

4
sickbeard/webserve.py
View file

@ -2210,9 +2210,9 @@ class Home(MainHandler):
t = PageTemplate(web_handler=self, file='editShow.tmpl') t = PageTemplate(web_handler=self, file='editShow.tmpl')
t.submenu = self.HomeMenu() t.submenu = self.HomeMenu()
t.expand_ids = all([kwargs.get('tvsrc'), kwargs.get('srcid')]) t.expand_ids = all([kwargs.get('tvsrc'), helpers.tryInt(kwargs.get('srcid'))])
t.tvsrc = int(kwargs.get('tvsrc', 0)) t.tvsrc = int(kwargs.get('tvsrc', 0))
t.srcid = kwargs.get('srcid') t.srcid = helpers.tryInt(kwargs.get('srcid'))
myDB = db.DBConnection() myDB = db.DBConnection()
t.seasonResults = myDB.select( t.seasonResults = myDB.select(