Browse Source

Merge branch '2.6.0/master'

Joël Cuissinat 2 years ago
parent
commit
b8b2bf5341
3 changed files with 2 additions and 8 deletions
  1. 1
    1
      tmpl/admin.yaml
  2. 1
    5
      tmpl/cloud.yaml
  3. 0
    2
      tmpl/sunstone-server.conf

+ 1
- 1
tmpl/admin.yaml View File

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

+ 1
- 5
tmpl/cloud.yaml View File

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

+ 0
- 2
tmpl/sunstone-server.conf View File

@@ -183,9 +183,7 @@
183 183
 #    - other
184 184
 
185 185
 :routes:
186
-%if %%getVar('activer_oneflow', 'non') == 'oui'
187 186
     - oneflow
188
-%end if
189 187
 %if %%getVar('activer_market_views', 'non') == 'oui'
190 188
     - appmarket
191 189
 %end if