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-02 13:58:20 +01:00
commit 6263656fca
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

@ -8,6 +8,11 @@
### 0.16.3 (2018-05-02 13:55:00 UTC)
* Fix issue on displayShow
### 0.16.2 (2018-05-02 00:25:00 UTC) ### 0.16.2 (2018-05-02 00:25:00 UTC)
* Change use copy of showObj for UI to preserve original object structs * Change use copy of showObj for UI to preserve original object structs

4
sickbeard/webserve.py
View file

@ -1911,7 +1911,7 @@ class Home(MainHandler):
if showObj.is_anime: if showObj.is_anime:
t.bwl = showObj.release_groups t.bwl = showObj.release_groups
showObj.exceptions = scene_exceptions.get_scene_exceptions(showObj.indexerid) t.show.exceptions = scene_exceptions.get_scene_exceptions(showObj.indexerid)
t.fanart = [] t.fanart = []
cache_obj = image_cache.ImageCache() cache_obj = image_cache.ImageCache()
@ -1944,7 +1944,7 @@ class Home(MainHandler):
indexerid = int(showObj.indexerid) indexerid = int(showObj.indexerid)
indexer = int(showObj.indexer) indexer = int(showObj.indexer)
t.min_initial = Quality.get_quality_ui(min(Quality.splitQuality(showObj.quality)[0])) t.min_initial = Quality.get_quality_ui(min(Quality.splitQuality(showObj.quality)[0]))
t.all_scene_exceptions = showObj.exceptions t.all_scene_exceptions = t.show.exceptions
t.scene_numbering = get_scene_numbering_for_show(indexerid, indexer) t.scene_numbering = get_scene_numbering_for_show(indexerid, indexer)
t.scene_absolute_numbering = get_scene_absolute_numbering_for_show(indexerid, indexer) t.scene_absolute_numbering = get_scene_absolute_numbering_for_show(indexerid, indexer)
t.xem_numbering = get_xem_numbering_for_show(indexerid, indexer) t.xem_numbering = get_xem_numbering_for_show(indexerid, indexer)