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

Merge remote-tracking branch 'origin/master' into feature-4317

Browse Source 
Conflicts:
	src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb
This commit is contained in:
Carlos Martín 2016-02-16 12:32:33 +01:00
commit 45a95de6b9
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sunstone/etc/sunstone-views/admin.yaml
View File

@ -21,7 +21,7 @@ enabled_tabs:
- secgroups-tab
- vrouters-tab
- zones-tab
- oneflow-dashboard
- oneflow-dashboard-tab
- oneflow-services-tab
- oneflow-templates-tab
- marketplaces-tab
@ -473,11 +473,11 @@ tabs:
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
oneflow-dashboard:
oneflow-dashboard-tab:
panel_tabs:
table_columns:
actions:
oneflow-services:
oneflow-services-tab:
panel_tabs:
service_info_tab: true
service_roles_tab: true
@ -532,7 +532,7 @@ tabs:
Service.shutdown: true
Service.recover: true
Service.delete: true
oneflow-templates:
oneflow-templates-tab:
panel_tabs:
service_template_info_tab: true
service_template_roles_tab: true

8
src/sunstone/etc/sunstone-views/admin_vcenter.yaml
View File

@ -20,7 +20,7 @@ enabled_tabs:
#- secgroups-tab
- vrouters-tab
- zones-tab
- oneflow-dashboard
- oneflow-dashboard-tab
- oneflow-services-tab
- oneflow-templates-tab
- settings-tab
@ -464,11 +464,11 @@ tabs:
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
oneflow-dashboard:
oneflow-dashboard-tab:
panel_tabs:
table_columns:
actions:
oneflow-services:
oneflow-services-tab:
panel_tabs:
service_info_tab: true
service_roles_tab: true
@ -523,7 +523,7 @@ tabs:
Service.shutdown: true
Service.recover: true
Service.delete: true
oneflow-templates:
oneflow-templates-tab:
panel_tabs:
service_template_info_tab: true
service_template_roles_tab: true

8
src/sunstone/etc/sunstone-views/user.yaml
View File

@ -20,7 +20,7 @@ enabled_tabs:
- secgroups-tab
- vrouters-tab
#- zones-tab
- oneflow-dashboard
- oneflow-dashboard-tab
- oneflow-services-tab
- oneflow-templates-tab
- marketplaces-tab
@ -468,11 +468,11 @@ tabs:
VirtualRouter.delete: true
VirtualRouter.attachnic: true
VirtualRouter.detachnic: true
oneflow-dashboard:
oneflow-dashboard-tab:
panel_tabs:
table_columns:
actions:
oneflow-services:
oneflow-services-tab:
panel_tabs:
service_info_tab: true
service_roles_tab: true
@ -527,7 +527,7 @@ tabs:
Service.shutdown: true
Service.recover: true
Service.delete: true
oneflow-templates:
oneflow-templates-tab:
panel_tabs:
service_template_info_tab: true
service_template_roles_tab: true

2
src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb
View File

@ -99,7 +99,7 @@ module OpenNebulaJSON
def instantiate(params=Hash.new)
if params['template']
select_network = self['TEMPLATE/SUNSTONE_NETWORK_SELECT']
select_network = self['TEMPLATE/SUNSTONE/NETWORK_SELECT']
if (select_network && select_network.upcase == "NO")
params['template'].delete("NIC")
end

2
src/sunstone/public/app/main.js
View File

@ -139,7 +139,7 @@ require.config({
'tabs/secgroups-tab',
'tabs/vrouters-tab',
'tabs/zones-tab',
'tabs/oneflow-dashboard',
'tabs/oneflow-dashboard-tab',
'tabs/oneflow-services-tab',
'tabs/oneflow-templates-tab',
'tabs/marketplaces-tab',

2
src/sunstone/public/app/tabs/oneflow-dashboard.js
View File

@ -15,7 +15,7 @@
/* -------------------------------------------------------------------------- */
define(function(require) {
var TAB_ID = 'oneflow-dashboard';
var TAB_ID = 'oneflow-dashboard-tab';
var Tab = {
tabId: TAB_ID,

2
src/sunstone/public/app/tabs/oneflow-services-tab.js
View File

@ -45,7 +45,7 @@ define(function(require) {
tabId: TAB_ID,
title: Locale.tr("Services"),
tabClass: "subTab",
parentTab: "oneflow-dashboard",
parentTab: "oneflow-dashboard-tab",
listHeader: '<i class="fa fa-fw fa-cubes"></i>&emsp;'+Locale.tr("OneFlow - Services"),
infoHeader: '<i class="fa fa-fw fa-cubes"></i>&emsp;'+Locale.tr("OneFlow - Service"),
subheader: '',

4
src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js
View File

@ -187,7 +187,7 @@ define(function(require) {
this.servicerolesDataTable.initialize();
Sunstone.insertButtonsInTab("oneflow-services", "service_roles_tab", roles_buttons, $('#role_actions', context));
Sunstone.insertButtonsInTab(TAB_ID, "service_roles_tab", roles_buttons, $('#role_actions', context));
}
}
@ -299,7 +299,7 @@ define(function(require) {
this.serviceroleVMsDataTable.initialize();
Sunstone.insertButtonsInTab(
"oneflow-services",
TAB_ID,
"service_roles_tab",
roles_vm_buttons,
$('div#role_vms_actions', context));

2
src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js
View File

@ -15,5 +15,5 @@
/* -------------------------------------------------------------------------- */
define(function(require){
return 'oneflow-services';
return 'oneflow-services-tab';
});

2
src/sunstone/public/app/tabs/oneflow-templates-tab.js
View File

@ -46,7 +46,7 @@ define(function(require) {
tabId: TAB_ID,
title: Locale.tr("Templates"),
tabClass: "subTab",
parentTab: "oneflow-dashboard",
parentTab: "oneflow-dashboard-tab",
listHeader: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+Locale.tr("OneFlow - Templates"),
infoHeader: '<i class="fa fa-fw fa-file-o"></i>&emsp;'+Locale.tr("OneFlow - Template"),
subheader: '',

2
src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js
View File

@ -15,5 +15,5 @@
/* -------------------------------------------------------------------------- */
define(function(require){
return 'oneflow-templates';
return 'oneflow-templates-tab';
});

2
src/vmm/VirtualMachineManager.cc
View File

@ -2436,7 +2436,7 @@ void VirtualMachineManager::attach_nic_action(
disk = vm->get_context();
if ( disk != 0 )
if (disk != 0 && !vm->get_host_is_cloud())
{
vm_tm_mad = vm->get_tm_mad();