codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Webui] Show user in connection manager

This commit is contained in:
bendikro 2015-12-29 20:32:40 +01:00
parent 9b18fb2b71
commit 9319e07db5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deluge/ui/web/js/deluge-all/ConnectionManager.js
View File

@ -35,10 +35,11 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
this.list = new Ext.list.ListView({ this.list = new Ext.list.ListView({
store: new Ext.data.ArrayStore({ store: new Ext.data.ArrayStore({
fields: [ fields: [
{name: 'status', mapping: 3}, {name: 'status', mapping: 4},
{name: 'host', mapping: 1}, {name: 'host', mapping: 1},
{name: 'port', mapping: 2}, {name: 'port', mapping: 2},
{name: 'version', mapping: 4} {name: 'user', mapping: 3},
{name: 'version', mapping: 5}
], ],
id: 0 id: 0
}), }),
@ -62,7 +63,7 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
header: _('Host'), header: _('Host'),
width: .51, width: .51,
sortable: true, sortable: true,
tpl: '{host}:{port}', tpl: '{user}@{host}:{port}',
dataIndex: 'host' dataIndex: 'host'
}, { }, {
header: _('Version'), header: _('Version'),

4
deluge/ui/web/json_api.py
View File

@ -306,6 +306,7 @@ HOSTLIST_PASS = 4
HOSTS_ID = HOSTLIST_ID HOSTS_ID = HOSTLIST_ID
HOSTS_NAME = HOSTLIST_NAME HOSTS_NAME = HOSTLIST_NAME
HOSTS_PORT = HOSTLIST_PORT HOSTS_PORT = HOSTLIST_PORT
HOSTS_USER = HOSTLIST_USER
HOSTS_STATUS = 3 HOSTS_STATUS = 3
HOSTS_INFO = 4 HOSTS_INFO = 4
@ -746,7 +747,7 @@ class WebApi(JSONComponent):
Return the hosts in the hostlist. Return the hosts in the hostlist.
""" """
log.debug("get_hosts called") log.debug("get_hosts called")
return [(tuple(host[HOSTS_ID:HOSTS_PORT + 1]) + ("Offline",)) for host in self.host_list["hosts"]] return [(tuple(host[HOSTS_ID:HOSTS_USER + 1]) + ("Offline",)) for host in self.host_list["hosts"]]
@export @export
def get_host_status(self, host_id): def get_host_status(self, host_id):
@ -756,7 +757,6 @@ class WebApi(JSONComponent):
:param host_id: the hash id of the host :param host_id: the hash id of the host
:type host_id: string :type host_id: string
""" """
def response(status, info=None): def response(status, info=None):
return host_id, host, port, status, info return host_id, host, port, status, info