moparisthebest
/
SickRage
mirror of https://github.com/moparisthebest/SickRage
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed issues with WebAPI builder - incorrect jquery libs specified

This commit is contained in:
echel0n 2014-12-16 23:48:31 -08:00
parent 33c070ae13
commit 5a3d11a0fe
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/slick/interfaces/default/apiBuilder.tmpl
View File

@ -12,7 +12,7 @@
sbRoot = "$sbRoot";
//-->
</script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.7.2.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/apibuilder.js?$sbPID"></script>
<style type="text/css">
@ -353,7 +353,6 @@ addOption("show.pause-opt", "Pause", "&pause=1");
#for $curShow in $sortedShowList:
addList("show.delete", "$curShow.name", "&indexerid=$curShow.indexerid", "show.delete-opt");
#end for
addOption("show.delete-opt", "Optional Param", "", 1);
addOption("show.delete-opt", "Remove Files", "&removefiles=1");
addOption("show.delete-opt", "Don't Remove Files", "&removefiles=0");

2
sickbeard/logger.py
View File

@ -59,7 +59,6 @@ class CensorLoggingAdapter(logging.LoggerAdapter):
msg = msg.replace(v, len(v) * '*')
return msg, kwargs
class Logger(object):
def __init__(self):
self.logger = CensorLoggingAdapter(logging.getLogger('sickrage'), censoredItems)
@ -68,6 +67,7 @@ class Logger(object):
logging.getLogger('sickrage'),
logging.getLogger('tornado.general'),
logging.getLogger('tornado.application'),
#logging.getLogger('tornado.access'),
]
self.consoleLogging = False