moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2025-01-07 11:58:01 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/nightly' into nightly

Browse Source
This commit is contained in:
echel0n 2014-07-28 09:53:16 -07:00
commit 60a6569064
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gui/slick/images/network/nine network.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

10
gui/slick/js/configNotifications.js
View File

@ -268,10 +268,12 @@ $(document).ready(function(){
var devices = jQuery.parseJSON(data).devices; var devices = jQuery.parseJSON(data).devices;
$("#pushbullet_device_list").html(''); $("#pushbullet_device_list").html('');
for (var i = 0; i < devices.length; i++) { for (var i = 0; i < devices.length; i++) {
if(current_pushbullet_device == devices[i].iden) { if(devices[i].active == true) {
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'" selected>' + devices[i].extras.nickname + '</option>') if(current_pushbullet_device == devices[i].iden) {
} else { $("#pushbullet_device_list").append('<option value="'+devices[i].iden+'" selected>' + devices[i].nickname + '</option>')
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'">' + devices[i].extras.nickname + '</option>') } else {
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'">' + devices[i].nickname + '</option>')
}
} }
} }
if(msg) { if(msg) {

3
sickbeard/notifiers/pushbullet.py
View File

@ -69,7 +69,7 @@ class PushbulletNotifier:
if method == 'POST': if method == 'POST':
uri = '/v2/pushes' uri = '/v2/pushes'
else: else:
uri = '/api/devices' uri = '/v2/devices'
logger.log(u"Pushbullet event: " + str(event), logger.DEBUG) logger.log(u"Pushbullet event: " + str(event), logger.DEBUG)
logger.log(u"Pushbullet message: " + str(message), logger.DEBUG) logger.log(u"Pushbullet message: " + str(message), logger.DEBUG)
@ -106,6 +106,7 @@ class PushbulletNotifier:
response = http_handler.getresponse() response = http_handler.getresponse()
request_body = response.read() request_body = response.read()
request_status = response.status request_status = response.status
logger.log(u"Pushbullet response: %s" % request_body, logger.DEBUG)
if request_status == 200: if request_status == 200:
if testMessage: if testMessage: