Merge branch '2.6.0/master'

This commit is contained in:
Joël Cuissinat 2016-11-16 16:58:44 +01:00
commit b8b2bf5341
3 changed files with 2 additions and 8 deletions

View File

@ -219,7 +219,7 @@ tabs:
scheduling: true
hybrid: true
other: true
%if %%getVar('activer_oneflow','non')
%if %%oneflow
oneflow-templates-tab:
panel_tabs:
service_template_info_tab: true

View File

@ -1,4 +1,3 @@
%set oneflow = %%getVar('activer_oneflow','non') == 'oui'
provision_logo: images/opennebula-5.0.png
enabled_tabs:
- provision-tab
@ -29,9 +28,6 @@ tabs:
vm_template_tab: false
vm_log_tab: false
provision_tabs:
%if %%oneflow
flows: true
%end if
templates: true
actions: &provisionactions
# In the cloud view, delete is the equivalent
@ -140,4 +136,4 @@ tabs:
- 2 # Owner
#- 3 # Group
- 4 # Name
#- 5 # Labels
#- 5 # Labels

View File

@ -183,9 +183,7 @@
# - other
:routes:
%if %%getVar('activer_oneflow', 'non') == 'oui'
- oneflow
%end if
%if %%getVar('activer_market_views', 'non') == 'oui'
- appmarket
%end if