This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit bd7833778b5be6468b5d69d355240b533ad3151f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 10 15:36:49 2014 +0100 JSON webUI: provide server name and SSH port as two different fields in the JSON output tree --- x2gobroker/web/json.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 5d2d295..bbbcb81 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -173,11 +173,11 @@ class X2GoBrokerWeb(_RequestHandler): profile_info = broker_backend.select_session(profile_id=profile_id, username=username) if profile_info.has_key('server'): - if profile_info.has_key('server') and profile_info.has_key('port'): - selected_session['server'] = "{server}:{port}".format(server=profile_info['server'], port=profile_info['port']) + selected_session['server'] = "{server}".format(server=profile_info['server']) + if profile_info.has_key('port'): + selected_session['port'] = "{port}".format(port=profile_info['port']) else: - selected_session['server'] = "{server}".format(server=profile_info['server']) - + selected_session['port'] = "22" if profile_info.has_key('authentication_privkey'): selected_session['key'] = profile_info['authentication_privkey'] -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git