dockeruser
/
SickGear
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into develop

pull/1093/head
JackDandy 7 years ago
parent
1895490dc9 22e3b5d353
commit
30f5bcd82a
2 changed files with 9 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      CHANGES.md
  2. 6
      sickbeard/webserve.py

5
CHANGES.md
View File

@ -8,6 +8,11 @@
### 0.16.2 (2018-05-02 00:25:00 UTC)
* Change use copy of showObj for UI to preserve original object structs
### 0.16.1 (2018-05-01 13:20:00 UTC) ### 0.16.1 (2018-05-01 13:20:00 UTC)
* Fix IMDb links to older shows on displayshow and editshow page * Fix IMDb links to older shows on displayshow and editshow page

6
sickbeard/webserve.py
View File

@ -1801,7 +1801,8 @@ class Home(MainHandler):
t.submenu.append( t.submenu.append(
{'title': 'Download Subtitles', 'path': 'home/subtitleShow?show=%d' % showObj.indexerid}) {'title': 'Download Subtitles', 'path': 'home/subtitleShow?show=%d' % showObj.indexerid})
t.show = showObj import copy
t.show = copy.deepcopy(showObj)
self.fix_imdb_id(t.show) self.fix_imdb_id(t.show)
with BS4Parser('<html><body>%s</body></html>' % showObj.overview, features=['html5lib', 'permissive']) as soup: with BS4Parser('<html><body>%s</body></html>' % showObj.overview, features=['html5lib', 'permissive']) as soup:
try: try:
@ -2232,7 +2233,8 @@ class Home(MainHandler):
t.groups.append(dict([('name', 'Did not initialise AniDB. Check debug log if reqd.'), ('rating', ''), ('range', '')])) t.groups.append(dict([('name', 'Did not initialise AniDB. Check debug log if reqd.'), ('rating', ''), ('range', '')]))
with showObj.lock: with showObj.lock:
t.show = showObj import copy
t.show = copy.deepcopy(showObj)
self.fix_imdb_id(t.show) self.fix_imdb_id(t.show)
t.show_has_scene_map = showObj.indexerid in sickbeard.scene_exceptions.xem_ids_list[showObj.indexer] t.show_has_scene_map = showObj.indexerid in sickbeard.scene_exceptions.xem_ids_list[showObj.indexer]

Write Preview
Loading…
Cancel
Save