shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

F #2427: Fixed bug with SCHED_REQUERIMENTS filled in Sunstone (#2622)

Browse Source
This commit is contained in:
juanmont 2018-11-22 11:25:05 +01:00 committed by Ruben S. Montero
parent 1f7c91839e
commit 33881af9ca
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js
View File

@ -324,7 +324,7 @@ define(function(require) {
$(".auto", context).show();
if ( templateJSON["SCHED_REQUIREMENTS"] ) {
$("input#"+this.nicTabId+"_SCHED_REQUIREMENTS", context).val(templateJSON["SCHED_REQUIREMENTS"]);
$("input#"+this.nicTabId+"_SCHED_REQUIREMENTS", context).val(templateJSON["SCHED_REQUIREMENTS"].split('"').join("\\\""));
}
if ( templateJSON["SCHED_RANK"] ) {

8
src/sunstone/public/app/utils/nics-section.js
View File

@ -128,6 +128,10 @@ define(function(require) {
if ( rank && rank !== "" ){
nic["SCHED_RANK"] = rank;
}
} else {
delete nic["NETWORK_MODE"];
delete nic["SCHED_REQUIREMENTS"];
delete nic["SCHED_RANK"];
}
if ( !nic["NETWORK_MODE"] || ( nic["NETWORK_MODE"] && nic["NETWORK_MODE"] !== "auto" ) )
@ -269,7 +273,7 @@ define(function(require) {
var selected_vnets = vnetsTableAuto.retrieveResourceTableSelect();
$.each(selected_vnets, function(index, netID) {
req_string.push('ID="'+netID+'"');
req_string.push('ID=\\"'+netID+'\\"');
});
$(".SCHED_REQUIREMENTS", dd_context).val(req_string.join(" | "));
}
@ -320,7 +324,7 @@ define(function(require) {
$(".auto", dd_context).show();
if ( options.nic["SCHED_REQUIREMENTS"] ) {
$("input#provision_accordion_dd_"+provision_nic_accordion_dd_id+"_SCHED_REQUIREMENTS", dd_context).val(options.nic["SCHED_REQUIREMENTS"]);
$("input#provision_accordion_dd_"+provision_nic_accordion_dd_id+"_SCHED_REQUIREMENTS", dd_context).val(options.nic["SCHED_REQUIREMENTS"].split('"').join("\\\""));
}
if ( options.nic["SCHED_RANK"] ) {