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

B #4697: Fix create vm dialog (#4775)

Browse Source
This commit is contained in:
Sergio Betanzos 2020-05-20 15:30:08 +02:00 committed by GitHub
parent 759a54cf3c
commit 7c910c6149
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js
View File

@ -443,22 +443,8 @@ define(function(require) {
var idsLength = this.selected_nodes.length;
var idsDone = 0;
$.each(this.selected_nodes, function(index, template_id) {
OpenNebulaTemplate.show({
data : {
id: template_id,
extended: false
},
timeout: true,
success: function (request, template_json) {
that.template_base_objects[template_json.VMTEMPLATE.ID] = template_json;
}
});
});
templatesContext.html("");
$.each(this.selected_nodes, function(index, template_id) {
OpenNebulaTemplate.show({
data : {
id: template_id,
@ -466,6 +452,7 @@ define(function(require) {
},
timeout: true,
success: function (request, template_json) {
that.template_base_objects[template_json.VMTEMPLATE.ID] = template_json;
that.template_objects.push(template_json);
var options = {

60
src/sunstone/public/app/tabs/vms-tab/form-panels/create.js
View File

@ -70,37 +70,39 @@ define(function(require) {
$(".selectTemplateTable", context).html('<br/>' + this.templatesTable.dataTableHTML + '<br/>');
this.templatesTable.initialize();
this.templatesTable.idInput().on("change", function(){
$(".nameContainer", context).show();
$(".persistentContainer", context).show();
var templatesContext = $(".list_of_templates", context);
templatesContext.html("");
templatesContext.show();
var template_id = $(this).val();
var showRestForm = template_id !== "";
var template_id = $(this).val();
if(template_id){
that.setTemplateIds(context, [template_id]);
var leasesThat = {};
function FormPanel() {
this.name = this.name;
}
Object.assign(leasesThat, that);
leasesThat.resource = "vm";
leasesThat.resourceId = template_id;
if(
OpenNebulaAction &&
OpenNebulaAction.cache &&
OpenNebulaAction.cache("VMTEMPLATE") &&
OpenNebulaAction.cache("VMTEMPLATE").data &&
OpenNebulaAction.cache("VMTEMPLATE").data[template_id] &&
OpenNebulaAction.cache("VMTEMPLATE").data[template_id].VMTEMPLATE &&
OpenNebulaAction.cache("VMTEMPLATE").data[template_id].VMTEMPLATE.TEMPLATE
){
leasesThat.jsonTemplate = OpenNebulaAction.cache("VMTEMPLATE").data[template_id].VMTEMPLATE.TEMPLATE;
}
leasesThat.__proto__ = FormPanel.prototype;
Leases.actions(leasesThat);
$(".nameContainer", context).toggle(showRestForm);
$(".persistentContainer", context).toggle(showRestForm);
var templatesContext = $(".list_of_templates", context);
templatesContext.html("");
templatesContext.toggle(showRestForm);
if(showRestForm) {
that.setTemplateIds(context, [template_id]);
var leasesThat = {};
function FormPanel() {
this.name = this.name;
}
Object.assign(leasesThat, that);
leasesThat.resource = "vm";
leasesThat.resourceId = template_id;
if(
OpenNebulaAction &&
OpenNebulaAction.cache &&
OpenNebulaAction.cache("VMTEMPLATE") &&
OpenNebulaAction.cache("VMTEMPLATE").data &&
OpenNebulaAction.cache("VMTEMPLATE").data[template_id] &&
OpenNebulaAction.cache("VMTEMPLATE").data[template_id].VMTEMPLATE &&
OpenNebulaAction.cache("VMTEMPLATE").data[template_id].VMTEMPLATE.TEMPLATE
){
leasesThat.jsonTemplate = OpenNebulaAction.cache("VMTEMPLATE").data[template_id].VMTEMPLATE.TEMPLATE;
}
leasesThat.__proto__ = FormPanel.prototype;
Leases.actions(leasesThat);
}
});
Tips.setup(context);
}

5
src/sunstone/public/app/utils/tab-datatable.js
View File

@ -1012,12 +1012,13 @@ define(function(require) {
$('tbody input.check_item', that.dataTable).prop('checked', false);
$('#' + that.dataTableId + '_search', section).val("").trigger("input");
$('#selected_resource_id_' + that.dataTableId, section).val("").trigger("change");
$('#selected_resource_name_' + that.dataTableId, section).text("").trigger("change").hide();
$('#refresh_button_' + that.dataTableId).click();
$('#selected_resource_name_' + that.dataTableId, section).text("").hide();
$('#selected_resource_' + that.dataTableId, section).hide();
$('#select_resource_' + that.dataTableId, section).show();
}
// Returns an ID, or an array of IDs for that.selectOptions.multiple_choice