Merge remote-tracking branch 'limetech/6.4-wip' into 6.4-wip

This commit is contained in:
bergware
2018-03-07 13:40:26 +01:00
6 changed files with 242 additions and 44 deletions
@@ -24,7 +24,7 @@ function addVMContext(name, uuid, template, state, vncurl, log){
}
if (state == "running") {
opts.push({text:"Stop", icon:"fa-stop", action:function(e) {
e.preventDefault();
e.preventDefault();
ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist");
}});
opts.push({text:"Pause", icon:"fa-pause", action:function(e) {
@@ -86,6 +86,7 @@ function addVMContext(name, uuid, template, state, vncurl, log){
}});
}
} else {
opts.push({text:"Edit", icon:"fa-pencil", href:path+'/UpdateVM?uuid='+uuid});
opts.push({text:"View XML", icon:"fa-code", href:path+'/UpdateVM?template=Custom&uuid='+uuid});
}
context.attach('#vm-'+uuid, opts);