Revision 6f4c1371 ui/static/synnefo.js
| b/ui/static/synnefo.js | ||
|---|---|---|
| 1188 | 1188 |
//ajax_success('DEFAULT');
|
| 1189 | 1189 |
return false; |
| 1190 | 1190 |
} |
| 1191 |
|
|
| 1191 | 1192 |
var serverID = serverIDs.pop(); |
| 1192 |
|
|
| 1193 | 1193 |
var machine = get_machine(serverID); |
| 1194 | 1194 |
var serverName = machine.name; |
| 1195 |
|
|
| 1195 | 1196 |
try {
|
| 1196 | 1197 |
var serverIP = machine.addresses.values[0].values[0].addr; |
| 1197 | 1198 |
} catch(err) { var serverIP = 'undefined'; }
|
| ... | ... | |
| 1200 | 1201 |
var os = machine.metadata.values.OS; |
| 1201 | 1202 |
} catch(err) { var os = 'undefined'; }
|
| 1202 | 1203 |
|
| 1203 |
var params_url = '?ip_address=' + serverIP + '&os=' + os; |
|
| 1204 |
|
|
| 1205 |
//console.log(serverIP); |
|
| 1206 |
//console.log(machine.addresses); |
|
| 1207 |
//console.log(machine.addresses.values[0].values[0].addr); |
|
| 1204 |
var params_url = '?ip_address=' + serverIP + '&os=' + os + "&host_os=" + $.client.os; |
|
| 1208 | 1205 |
|
| 1209 |
//show_connect_dialog(machine, ip); |
|
| 1206 |
if ($.client.os == "Windows" && os == "windows") {
|
|
| 1207 |
window.open('machines/connect' + params_url + "&rdp=1");
|
|
| 1208 |
return; |
|
| 1209 |
} |
|
| 1210 |
|
|
| 1210 | 1211 |
try {
|
| 1211 | 1212 |
msg_box({title:'Connect to ' + serverName,content:'loading...',extra:'',
|
| 1212 | 1213 |
'ajax':'machines/connect' + params_url, |
| ... | ... | |
| 1219 | 1220 |
}); |
| 1220 | 1221 |
} catch (error) {
|
| 1221 | 1222 |
console.log(error); |
| 1222 |
window.open('machines/connect' + params_url);
|
|
| 1223 |
window.open('machines/connect' + params_url);
|
|
| 1223 | 1224 |
} |
| 1224 | 1225 |
|
| 1225 | 1226 |
|
Also available in: Unified diff