From 799f0fa2f4a5863bdd37e70f399e3e26778f1f32 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 26 Sep 2012 15:12:06 +0200 Subject: [PATCH 1/2] Appflow: add vnc column to service VM list --- .../public/js/user-plugins/apptools.appflow.services.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js index ab08479243..3ceb0a11df 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js @@ -599,6 +599,7 @@ function updateServiceInfo(request,elem){ '+tr("Host")+'\ '+tr("IPs")+'\ '+tr("Start Time")+'\ + '+tr("VNC Access")+'\ \ \ \ @@ -657,7 +658,7 @@ function updateServiceInfo(request,elem){ if (vm_info) vms.push( [roles[i].name].concat( - vMachineElementArray(vm_info).slice(1,-1) + vMachineElementArray(vm_info).slice(1) ) ); }; @@ -670,7 +671,7 @@ function updateServiceInfo(request,elem){ "sDom" : '<"H"lfrC>t<"F"ip>', "aoColumnDefs": [ { "sWidth": "60px", "aTargets": [6,7] }, - { "sWidth": "35px", "aTargets": [1] }, + { "sWidth": "35px", "aTargets": [1, 11] }, { "sWidth": "150px", "aTargets": [5,10] }, { "sWidth": "100px", "aTargets": [2,3,9] }, { "bVisible": false, "aTargets": [6,7,10]} @@ -684,6 +685,7 @@ function updateServiceInfo(request,elem){ var aData = servicevmsDataTable.fnGetData(this); var id = aData[1]; if (!id) return true; + if ($(e.target).is('img')) return true; //open the Vresources submenu in case it was closed var vres_menu = $('div#menu li#li_vres_tab') From d51030cf2f951059b2d4c3ed730c4181f410a4a3 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 26 Sep 2012 15:12:34 +0200 Subject: [PATCH 2/2] Appmarket: fix link to appliance --- .../public/js/user-plugins/apptools.appmarket.appliances.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js b/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js index c8a4f3ad4f..611c17ba89 100644 --- a/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js +++ b/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js @@ -175,6 +175,8 @@ function appmarketplaceElements(){ } function updateMarketInfo(request,app){ + var url = app.links.download.href; + url = url.replace(/\/download$/, ''); var info_tab = { title : tr("Appliance information"), content : @@ -189,7 +191,7 @@ function updateMarketInfo(request,app){ \ \ ' + tr("URL") + '\ - '+config_response.system_config.appmarketplace_url+'/'+app['_id']["$oid"]+'\ + '+url+'\ \ \ ' + tr("Publisher") + '\