\
\
' + Locale.tr("Uploading...") + '\
@@ -164,138 +184,135 @@ define(function(require) {
');
});
- uploader.on('progress', function() {
- $('span.meter', $('div[id="' + fileName + 'progressBar"]')).css('width', uploader.progress() * 100.0 + '%')
+ that.uploader.on('progress', function() {
+ $('span.meter', $('div[id="' + fileName + 'progressBar"]')).css('width', that.uploader.progress() * 100.0 + '%')
});
+ }
- uploader.on('fileSuccess', function(file) {
- $('div[id="' + fileName + '-info"]').text(Locale.tr("Registering in OpenNebula"));
+ return false;
+ }
+
+ function _submitWizard(dialog) {
+ var that = this;
+ var upload = false;
+
+ var ds_id = $('#img_datastore .resource_list_select', dialog).val();
+ if (!ds_id) {
+ Notifier.notifyError(Locale.tr("Please select a datastore for this image"));
+ return false;
+ }
+
+ var img_json = {};
+
+ var name = $('#img_name', dialog).val();
+ img_json["NAME"] = name;
+
+ var desc = $('#img_desc', dialog).val();
+ if (desc.length) {
+ img_json["DESCRIPTION"] = desc;
+ }
+
+ var type = $('#img_type', dialog).val();
+ img_json["TYPE"] = type;
+
+ img_json["PERSISTENT"] = $('#img_persistent:checked', dialog).length ? "YES" : "NO";
+
+ var dev_prefix = $('#img_dev_prefix', dialog).val();
+ if (dev_prefix.length) {
+ img_json["DEV_PREFIX"] = dev_prefix;
+ }
+
+ var driver = $('#img_driver', dialog).val();
+ if (driver.length)
+ img_json["DRIVER"] = driver;
+
+ var target = $('#img_target', dialog).val();
+ if (target)
+ img_json["TARGET"] = target;
+
+ switch ($('#src_path_select input:checked', dialog).val()){
+ case "path":
+ path = $('#img_path', dialog).val();
+ if (path) img_json["PATH"] = path;
+ break;
+ case "datablock":
+ size = $('#img_size', dialog).val();
+ fstype = $('#img_fstype', dialog).val();
+ if (size) img_json["SIZE"] = size;
+ if (fstype) img_json["FSTYPE"] = fstype;
+ break;
+ case "upload":
+ upload = true;
+ break;
+ }
+
+ //Time to add custom attributes
+ $('#custom_var_image_box option', dialog).each(function() {
+ var attr_name = $(this).attr('name');
+ var attr_value = $(this).val();
+ img_json[attr_name] = attr_value;
+ });
+
+ var img_obj = {
+ "image" : img_json,
+ "ds_id" : ds_id
+ };
+
+ //this is an image upload we trigger FileUploader
+ //to start the upload
+ if (upload) {
+ Sunstone.resetFormPanel(that.tabId, that.formPanelId);
+ Sunstone.hideFormPanel(that.tabId);
+
+ that.uploader.on('fileSuccess', function(file) {
+ $('div[id="' + file.fileName + '-info"]').text(Locale.tr("Registering in OpenNebula"));
$.ajax({
url: 'upload',
type: "POST",
data: {
csrftoken: csrftoken,
img : JSON.stringify(img_obj),
- file: fileName,
+ file: file.fileName,
tempfile: file.uniqueIdentifier
},
success: function() {
Notifier.notifyMessage("Image uploaded correctly");
- $('div[id="' + fileName + 'progressBar"]').remove();
+ $('div[id="' + file.fileName + 'progressBar"]').remove();
Sunstone.runAction("Image.refresh");
},
error: function(response) {
Notifier.onError({}, OpenNebulaError(response));
- $('div[id="' + fileName + 'progressBar"]').remove();
+ $('div[id="' + file.fileName + 'progressBar"]').remove();
}
});
});
+
+ that.uploader.upload();
+ } else {
+ Sunstone.runAction("Image.create", img_obj);
}
- $('#' + DIALOG_ID + 'Form', dialog).submit(function() {
- var exit = false;
- var upload = false;
- $('.img_man', this).each(function() {
- if (!$('input', this).val().length) {
- Notifier.notifyError(Locale.tr("There are mandatory parameters missing"));
- exit = true;
- return false;
- }
- });
- if (exit) { return false; }
+ return false;
+ }
- var ds_id = $('#img_datastore .resource_list_select', dialog).val();
- if (!ds_id) {
- Notifier.notifyError(Locale.tr("Please select a datastore for this image"));
- return false;
- };
-
- var img_json = {};
-
- var name = $('#img_name', dialog).val();
- img_json["NAME"] = name;
-
- var desc = $('#img_desc', dialog).val();
- if (desc.length) {
- img_json["DESCRIPTION"] = desc;
- }
-
- var type = $('#img_type', dialog).val();
- img_json["TYPE"] = type;
-
- img_json["PERSISTENT"] = $('#img_persistent:checked', dialog).length ? "YES" : "NO";
-
- var dev_prefix = $('#img_dev_prefix', dialog).val();
- if (dev_prefix.length) {
- img_json["DEV_PREFIX"] = dev_prefix;
- }
-
- var driver = $('#img_driver', dialog).val();
- if (driver.length)
- img_json["DRIVER"] = driver;
-
- var target = $('#img_target', dialog).val();
- if (target)
- img_json["TARGET"] = target;
-
- switch ($('#src_path_select input:checked', dialog).val()){
- case "path":
- path = $('#img_path', dialog).val();
- if (path) img_json["PATH"] = path;
- break;
- case "datablock":
- size = $('#img_size', dialog).val();
- fstype = $('#img_fstype', dialog).val();
- if (size) img_json["SIZE"] = size;
- if (fstype) img_json["FSTYPE"] = fstype;
- break;
- case "upload":
- upload = true;
- break;
- }
-
- //Time to add custom attributes
- $('#custom_var_image_box option', dialog).each(function() {
- var attr_name = $(this).attr('name');
- var attr_value = $(this).val();
- img_json[attr_name] = attr_value;
- });
-
- img_obj = {"image" : img_json,
- "ds_id" : ds_id};
-
- //we this is an image upload we trigger FileUploader
- //to start the upload
- if (upload) {
- that.hide();
- that.reset();
- uploader.upload();
- } else {
- Sunstone.runAction("Image.create", img_obj);
- };
+ function _submitAdvanced(dialog) {
+ var template = $('#template', dialog).val();
+ var ds_id = $('#img_datastore_raw .resource_list_select', dialog).val();
+ if (!ds_id) {
+ Notifier.notifyError(Locale.tr("Please select a datastore for this image"));
return false;
- });
+ }
- $('#create_image_submit_manual', dialog).click(function() {
- var template = $('#template', dialog).val();
- var ds_id = $('#img_datastore_raw .resource_list_select', dialog).val();
+ var img_obj = {
+ "image" : {
+ "image_raw" : template
+ },
+ "ds_id" : ds_id
+ };
- if (!ds_id) {
- Notifier.notifyError(Locale.tr("Please select a datastore for this image"));
- return false;
- };
+ Sunstone.runAction("Image.create", img_obj);
- var img_obj = {
- "image" : {
- "image_raw" : template
- },
- "ds_id" : ds_id
- };
- Sunstone.runAction("Image.create", img_obj);
-
- return false;
- });
return false;
}
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs
new file mode 100644
index 0000000000..aa98d7e807
--- /dev/null
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs
@@ -0,0 +1,18 @@
+
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js
new file mode 100644
index 0000000000..a447e07b29
--- /dev/null
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js
@@ -0,0 +1,3 @@
+define(function(require){
+ return 'createImageForm';
+})
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
new file mode 100644
index 0000000000..67fce15dd8
--- /dev/null
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
@@ -0,0 +1,196 @@
+
\ No newline at end of file