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

F #3874 use image name instead of id (#279)

Browse Source
This commit is contained in:
Abel Coronado 2017-04-25 12:39:57 +02:00 committed by Tino Vázquez
parent 04010af440
commit 99fce5b3ec
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js
View File

@ -29,6 +29,7 @@ define(function(require) {
var OpenNebulaHost = require('opennebula/host');
var UserInputs = require('utils/user-inputs');
var UniqueId = require('utils/unique-id');
var OpenNebula = require('opennebula');
/*
TEMPLATES
@ -285,8 +286,8 @@ define(function(require) {
}
if (contextJSON) {
var file_ds_regexp = /\$FILE\[IMAGE_ID=([0-9]+)+/g;
var net_regexp = /^NETWORK$/;;
var file_ds_regexp = /FILE\[IMAGE=(\w+?)\W+IMAGE_UNAME=(\w+?)\]/g;
var net_regexp = /^NETWORK$/;
var ssh_regexp = /^SSH_PUBLIC_KEY$/;
var token_regexp = /^TOKEN$/;
var report_ready_regexp = /^REPORT_READY$/;
@ -314,14 +315,24 @@ define(function(require) {
} else if ("FILES_DS" == key) {
WizardFields.fillInput($('.FILES_DS', context), contextJSON["FILES_DS"]);
var files = [];
while (match = file_ds_regexp.exec(value)) {
files.push(match[1])
}
var selectedResources = {
ids : files
OpenNebula.Image.list({
timeout: true,
success: function(request, obj_files){
while (match = file_ds_regexp.exec(value)) {
$.each(obj_files, function(key, value){
if(value.IMAGE.NAME == match[1] && value.IMAGE.UNAME == match[2]){
files.push(value.IMAGE.ID);
return false;
}
});
}
var selectedResources = {
ids : files
}
that.contextFilesTable.selectResourceTableSelect(selectedResources);
}
that.contextFilesTable.selectResourceTableSelect(selectedResources);
});
} else if ("START_SCRIPT_BASE64" == key) {
$(".ENCODE_START_SCRIPT", context).prop('checked', 'checked');
$(".START_SCRIPT", context).val(atob(value));
@ -343,9 +354,16 @@ define(function(require) {
var selected_files = this.contextFilesTable.retrieveResourceTableSelect();
$.each(selected_files, function(index, fileId) {
req_string.push("$FILE[IMAGE_ID="+ fileId +"]");
OpenNebula.Image.show({
timeout: true,
data : {
id: fileId
},
success: function(request, obj_file){
req_string.push("$FILE[IMAGE=" + obj_file.IMAGE.NAME + ", IMAGE_UNAME=" + obj_file.IMAGE.UNAME + "]");
$('.FILES_DS', context).val(req_string.join(" "));
}
});
});
$('.FILES_DS', context).val(req_string.join(" "));
};
});