Revision 406bf0d9 ui/static/synnefo.js

b/ui/static/synnefo.js
1236 1236
        //ajax_success('DEFAULT');
1237 1237
        return false;
1238 1238
    }
1239

  
1239
    
1240
    // prefer metadata values for specific options (username, domain)
1240 1241
    var username_meta_key = 'User';
1242
    var domain_meta_key = "Domain";
1241 1243

  
1242 1244
    var serverID = serverIDs.pop();
1243 1245
    var machine = get_machine(serverID);
......
1245 1247
    
1246 1248
    try {
1247 1249
        var serverIP = machine.addresses.values[0].values[0].addr;
1248
    } catch(err) { var serverIP = 'undefined'; }
1250
    } catch (err) { var serverIP = 'undefined'; }
1249 1251

  
1250 1252
    try {
1251 1253
        var os = os_icon(machine.metadata);
1252
    } catch(err) { var os = 'undefined'; }
1254
    } catch (err) { var os = 'undefined'; }
1253 1255

  
1254 1256
    var username = "";
1255 1257
    try {
1256 1258
        username = machine.metadata.values[username_meta_key];
1257
    } catch(err){ username = undefined}
1259
    } catch (err) { username = undefined }
1260

  
1261
    var domain = "";
1262
    try {
1263
        domain = machine.metadata.values[domain_meta_key];
1264
    } catch (erro) { domain = undefined }
1258 1265

  
1259 1266
    var params_url = '?ip_address=' + serverIP + '&os=' + os + "&host_os=" + $.client.os + "&srv=" + serverID;
1260 1267

  
1261 1268
    if (username) {
1262 1269
        params_url += "&username=" + username;
1263 1270
    }
1271

  
1272
    if (domain) {
1273
        params_url += "&domain=" + domain;
1274
    }
1264 1275
    
1265 1276
    if ($.client.os == "Windows" && os == "windows") {
1277
        // request rdp file
1266 1278
        window.open('machines/connect' + params_url + "&rdp=1");
1267 1279
        return;
1268 1280
    }
1269 1281
    
1282
    // FIXME: I18n ???
1270 1283
    var title = 'Connect to: ' + '<span class="machine-title"><img src="static/icons/machines/small/'+os+'-on.png" /> '+serverName+'</span>';
1271

  
1284
    
1285
    // open msg box and fill it with json data retrieved from connect machine view
1272 1286
    try {
1273
        msg_box({title:title, content:'loading...',extra:'',
1274
        'ajax':'machines/connect' + params_url,
1275
        parse_data:function(data){
1276
            var box_content = "<a href='"+data.link.url+"'>"+data.link.title+"</a>";
1277
            if (!data.link.url) {
1278
                box_content = "<span class='cmd'>"+data.link.title+"</span>";
1287
        // open msg box
1288
        msg_box({
1289
            title:title, 
1290
            content:'loading...',
1291
            extra:'', 'ajax':'machines/connect' + params_url,
1292
            parse_data:function(data){
1293
                var box_content = "<a href='"+data.link.url+"'>"+data.link.title+"</a>";
1294
                if (!data.link.url) {
1295
                    box_content = "<span class='cmd'>"+data.link.title+"</span>";
1296
                }
1297
                data.title = false;
1298
                data.content = data.info;
1299
                data.extra = box_content;
1300
                return data;
1279 1301
            }
1280
            data.title = false;
1281
            data.content = data.info;
1282
            data.extra = box_content;
1283
            return data;
1284
        }
1285 1302
        });
1286 1303
    } catch (error) {
1304
        // if msg box fails fallback redirecting the user to the connect url
1287 1305
        window.open('machines/connect' + params_url);
1288 1306
    }
1289 1307

  

Also available in: Unified diff