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

B #5227: Remove oneflow error on create app dialog (#791)

Browse Source
This commit is contained in:
Frederick Borges 2021-02-10 12:48:33 +01:00 committed by GitHub
parent 947c9716cd
commit 359174d880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb
View File

@ -145,9 +145,6 @@ module OpenNebulaJSON
if error_code == -1
if (params['IMPORT_ALL'] == 'yes')
ids_images.each do |id|
puts id
app = MarketPlaceApp.new_with_id(id, @client)
app.info
@ -215,6 +212,13 @@ module OpenNebulaJSON
}
end
if rc[:service_template]
response['SERVICE_TEMPLATE'] = []
rc[:service_template].each { |servicetemplate_id|
response['SERVICE_TEMPLATE'] << {:ID => servicetemplate_id}
}
end
return response
end
end

13
src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js
View File

@ -99,9 +99,22 @@ define(function(require) {
});
};
if (response['SERVICE_TEMPLATE'] !== undefined) {
$.each(response['SERVICE_TEMPLATE'], function(i, serviceTemplate) {
if (serviceTemplate.error != undefined) {
Notifier.notifyError(serviceTemplate.error.message);
} else if (serviceTemplate.ID != -1) {
Notifier.notifyCustom(Locale.tr("Service Template created"),
Navigation.link(" ID: " + serviceTemplate.ID, "oneflow-templates-tab", serviceTemplate.ID),
false);
}
});
};
Sunstone.hideFormPanel(TAB_ID);
OpenNebulaAction.clear_cache("IMAGE");
OpenNebulaAction.clear_cache("VMTEMPLATE");
OpenNebulaAction.clear_cache("SERVICE_TEMPLATE");
},
elements: function(opts) {
return Sunstone.getDataTable(TAB_ID).elements(opts);

12
src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js
View File

@ -32,6 +32,7 @@ define(function(require) {
var Config = require("sunstone-config");
var WizardFields = require("utils/wizard-fields");
var OpenNebula = require("opennebula");
var OpenNebulaAction = require("opennebula/action");
/*
TEMPLATES
@ -188,7 +189,6 @@ define(function(require) {
function _onShow(context) {
this.imagesTable.resetResourceTableSelect();
this.servicesTable.resetResourceTableSelect();
this.templatesTable.resetResourceTableSelect();
this.vmsTable.resetResourceTableSelect();
this.marketPlacesTable.resetResourceTableSelect();
@ -351,6 +351,16 @@ define(function(require) {
removeAttr("required").
removeAttr("wizard_field");
var success_func = function (){
$("#serviceMarketPlaceError").hide();
};
var error_func = function (){
$("#serviceMarketPlaceError").show();
};
OpenNebulaAction.list({options: undefined, success: success_func, error: error_func}, "DOCUMENT", "service_template");
$('#importAllCheckBox',context).show();
$('#servicesTableHTML', context).show();

6
src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs
View File

@ -60,14 +60,14 @@
<!-- START IMAGES/SERVICES/VMTEMPLATES/VM TABLES -->
<div>
<div id="servicesTableHTML">
<div class="row">
<fieldset id="servicesTableHTML">
<fieldset>
<legend>{{tr "Select the Service to create the App"}}</legend>
{{{servicesTableHTML}}}
</fieldset>
</div>
<div id="serviceMarketPlaceError" class="row oneflow_templates_error_message" hidden>
<div id="serviceMarketPlaceError" class="row oneflow_templates_error_message" style="padding-bottom: 2em; display: none;">
<div class="small-6 columns small-centered text-center">
<div class="label alert radius">{{tr "Cannot connect to OneFlow server"}}</div>
</div>