Revision 5bc1794f ui/static/synnefo.js
b/ui/static/synnefo.js | ||
---|---|---|
1237 | 1237 |
return false; |
1238 | 1238 |
} |
1239 | 1239 |
|
1240 |
var username_meta_key = 'User'; |
|
1241 |
|
|
1240 | 1242 |
var serverID = serverIDs.pop(); |
1241 | 1243 |
var machine = get_machine(serverID); |
1242 | 1244 |
var serverName = machine.name; |
... | ... | |
1249 | 1251 |
var os = os_icon(machine.metadata); |
1250 | 1252 |
} catch(err) { var os = 'undefined'; } |
1251 | 1253 |
|
1254 |
var username = ""; |
|
1255 |
try { |
|
1256 |
username = machine.metadata.values[username_meta_key]; |
|
1257 |
} catch(err){ username = undefined} |
|
1258 |
|
|
1252 | 1259 |
var params_url = '?ip_address=' + serverIP + '&os=' + os + "&host_os=" + $.client.os + "&srv=" + serverID; |
1260 |
|
|
1261 |
if (username) { |
|
1262 |
params_url += "&username=" + username; |
|
1263 |
} |
|
1253 | 1264 |
|
1254 | 1265 |
if ($.client.os == "Windows" && os == "windows") { |
1255 | 1266 |
window.open('machines/connect' + params_url + "&rdp=1"); |
Also available in: Unified diff