mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-21 20:14:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WebUI] Fix json import

Browse source
This commit is contained in:
Calum Lind 2014-07-22 23:34:19 +01:00
parent 480347296b
commit 205444f670
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deluge/core/torrent.py
View file

@ -602,7 +602,7 @@ class Torrent(object):
# This is an error'd torrent
self.state = "Error"
if status.error:
self.set_error_statusmsg(status.error)
self.set_error_statusmsg(decode_string(status.error))
self.set_status_message(self.error_statusmsg)
# This will be reverted upon resuming.
self.handle.auto_managed(False)

7
deluge/ui/web/server.py
View file

@ -42,6 +42,7 @@ import hashlib
import logging
import tempfile
import mimetypes
import json
from twisted.application import service, internet
from twisted.internet import reactor, defer, error
@ -128,7 +129,7 @@ class Upload(resource.Resource):
if "file" not in request.args:
request.setResponseCode(http.OK)
return common.json.dumps({
return json.dumps({
'success': True,
'files': []
})
@ -146,7 +147,7 @@ class Upload(resource.Resource):
request.setHeader("content-type", "text/html")
request.setResponseCode(http.OK)
return compress(common.json.dumps({
return compress(json.dumps({
'success': True,
'files': filenames
}), request)
@ -556,7 +557,7 @@ class TopLevel(resource.Resource):
web_config = component.get("Web").get_config()
web_config["base"] = request.base
config = dict([(key, web_config[key]) for key in UI_CONFIG_KEYS])
js_config = common.json.dumps(config)
js_config = json.dumps(config)
return template.render(scripts=scripts, stylesheets=self.stylesheets,
debug=debug, base=request.base, js_config=js_config)