Merge branch '2.6.0/master'

tmpl/admin.yaml

@@ -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

tmpl/cloud.yaml

@@ -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

tmpl/sunstone-server.conf

@@ -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