diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index fe3d087900..579c53aec5 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -416,7 +416,7 @@ function hostInfoListener(){
//updates the host select by refreshing the options in it
function updateHostSelect(){
- hosts_select = makeSelectOptions(dataTable_hosts,1,2,7,"DISABLED");
+ hosts_select = makeSelectOptions(dataTable_hosts,1,2,7,"DISABLED",-1);
}
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index 13f8b0d3b0..2824259d70 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -474,7 +474,8 @@ function imageInfoListener(){
//Updates the select input field with an option for each image
function updateImageSelect(){
- images_select = makeSelectOptions(dataTable_images,1,3,8,"DISABLED");
+ images_select =
+ makeSelectOptions(dataTable_images,1,3,8,"DISABLED",2);
//update static selectors:
//in the VM section
@@ -499,8 +500,7 @@ function deleteImageElement(req){
function addImageElement(request, image_json){
var element = imageElementArray(image_json);
addElement(element,dataTable_images);
- //NOTE that the select is not updated because newly added images
- //are disabled by default
+ updateImageSelect();
}
// Callback to refresh the list of images
diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index 363b0b4eb0..86ccb4b57a 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -724,7 +724,8 @@ function templateInfoListener(){
//Updates the select input field with an option for each template
function updateTemplateSelect(){
- templates_select = makeSelectOptions(dataTable_templates,1,3,5,"No");
+ templates_select =
+ makeSelectOptions(dataTable_templates,1,3,5,"no",2);
//update static selectors:
$('#create_vm_dialog #template_id').html(templates_select);
@@ -748,8 +749,7 @@ function deleteTemplateElement(req){
function addTemplateElement(request, template_json){
var element = templateElementArray(template_json);
addElement(element,dataTable_templates);
- //NOTE that the select is not updated because newly added templates
- //are not public
+ updateTemplateSelect();
}
// Callback to refresh the list of templates
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index da05b8a849..927461c1e1 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -308,7 +308,8 @@ function vNetworkInfoListener(){
//updates the vnet select different options
function updateNetworkSelect(){
- vnetworks_select= makeSelectOptions(dataTable_vNetworks,1,3,6,"no")
+ vnetworks_select=
+ makeSelectOptions(dataTable_vNetworks,1,3,6,"no",2);
//update static selectors:
//in the VM creation dialog
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index 359f203aec..d8216a2ef3 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -313,7 +313,7 @@ function waitingNodes(dataTable){
//not defined then it returns "uid UID".
//TODO not very nice to hardcode a dataTable here...
function getUserName(uid){
- var user = "uid "+uid;
+ var user = uid;
if (typeof(dataTable_users) == "undefined") {
return user;
}
@@ -382,7 +382,11 @@ function getSelectedNodes(dataTable){
//returns a HTML string with a select input code generated from
//a dataTable
-function makeSelectOptions(dataTable,id_col,name_col,status_col,status_bad){
+function makeSelectOptions(dataTable,
+ id_col,name_col,
+ status_col,
+ status_bad,
+ user_col){
var nodes = dataTable.fnGetData();
var select = "";
var array;
@@ -390,7 +394,11 @@ function makeSelectOptions(dataTable,id_col,name_col,status_col,status_bad){
var id = this[id_col];
var name = this[name_col];
var status = this[status_col];
- if (status != status_bad){
+ var user = user_col > 0 ? this[user_col] : false;
+ var isMine = user ? (username == user) || (uid == user) : true;
+
+
+ if ((status != status_bad) || isMine ){
select +='';
}
});
diff --git a/src/sunstone/public/vendor/noVNC/utils/websocket.pyc b/src/sunstone/public/vendor/noVNC/utils/websocket.pyc
new file mode 100644
index 0000000000..6c9e76f921
Binary files /dev/null and b/src/sunstone/public/vendor/noVNC/utils/websocket.pyc differ