Commit 834d9de2 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.3.82'

parents c02137ef 536c3baf
# Changelog
- * b5e4ac1 - 2018-10-12: Release v9.3.81
- * 69efb12 - 2018-10-13: Release v9.3.82
- * a120b3e - 2018-10-13: Fixed issue with re-scanning existing show episodes that do not contain the show name in the filename
- * a216e2b - 2018-10-13: Fixed issue with displaying provider icons for custom providers
- * f29e97d - 2018-10-12: Release v9.3.81
- * 35fb7f1 - 2018-10-12: Fixed issue with building Dockerfile. Added .dockerignore file. Fixed issue with viewing config settings.
- * 7141eec - 2018-10-09: Pre-Release v9.3.81.dev1
- * 7a20aea - 2018-10-09: Fixed issue with TorrentLeech logins
......
......@@ -259,6 +259,8 @@ class NameParser(object):
else:
bestResult.show = None
bestResult.indexerid = 0
elif self.showObj and not bestResult.show:
bestResult.show = self.showObj
# if this is a naming pattern test or result doesn't have a show object then return best result
if not bestResult.show or self.naming_pattern:
......
......@@ -101,7 +101,11 @@
class="provider_enabler text-left" ${('', 'checked')[bool(providerObj.isEnabled)]}/>
<a href="${anon_url(provider_url)}" class="text-right" rel="noreferrer"
onclick="window.open(this.href, '_blank'); return false;">
<i class="sickrage-providers sickrage-providers-${providerObj.id}"></i>
% if providerObj.type in ['nzb', 'torrent']:
<i class="sickrage-providers sickrage-providers-${providerObj.id}"></i>
% else:
<i class="sickrage-providers sickrage-providers-${providerObj.type}"></i>
% endif
</a>
<span class="font-weight-bold">${providerObj.name}</span>
</label>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment