github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/tp-api' of github.com:tp4a/teleport into feature/tp-api

dev
Apex Liu 2020-07-15 03:12:11 +08:00
parent 90d67e9ef2 579873f296
commit 7bf682af0f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/www/teleport/webroot/app/model/ops.py
View File

@ -482,7 +482,7 @@ def get_auth(auth_id):
def get_all_remotes(handler, sql_filter, sql_order, sql_limit):
s = SQL(get_db())
s.select_from('host', ['id', 'name', 'ip', 'router_ip', 'router_port', 'state'], alt_name='h')
s.select_from('host', ['id', 'name', 'ip', 'router_ip', 'router_port', 'desc', 'cid', 'state'], alt_name='h')
str_where = ''
_where = list()
@ -492,7 +492,7 @@ def get_all_remotes(handler, sql_filter, sql_order, sql_limit):
if k == 'state':
_where.append('h.state={}'.format(sql_filter[k]))
elif k == 'search':
_where.append('(h.name LIKE "%{k}%" OR h.ip LIKE "%{k}%" OR h.router_ip LIKE "%{k}%")'.format(k=sql_filter[k]))
_where.append('(h.name LIKE "%{k}%" OR h.ip LIKE "%{k}%" OR h.router_ip LIKE "%{k}%" OR h.desc LIKE "%{k}%" OR h.cid LIKE "%{k}%")'.format(k=sql_filter[k]))
elif k == 'host_group':
shg = SQL(get_db())
shg.select_from('group_map', ['mid'], alt_name='g')
@ -617,7 +617,7 @@ def get_remotes(handler, sql_filter, sql_order, sql_limit):
if k == 'search':
ss = SQL(get_db())
ss.select_from('host', ['id'], alt_name='h')
ss.where('(h.name LIKE "%{k}%" OR h.ip LIKE "%{k}%" OR h.router_ip LIKE "%{k}%")'.format(k=sql_filter[k]))
ss.where('(h.name LIKE "%{k}%" OR h.ip LIKE "%{k}%" OR h.router_ip LIKE "%{k}%" OR h.desc LIKE "%{k}%" OR h.cid LIKE "%{k}%")'.format(k=sql_filter[k]))
err = ss.query()
if err != TPE_OK:
return err, 0, 1, []