dicos/99_one-frontend.xml: Ajout d'une valeur par défaut pour market_place_url

Donc, finalement on conditionne l'affichagne de "l'onglet" market_place dans
les vues de sunstone.

On met une valeur par défaut avec l'url du market place de "OpenNebula.systems" (ex C12G Labs).

fixes #9543 @30m
This commit is contained in:
Philippe Caseiro 2014-11-18 15:04:41 +01:00
parent 5b7d63a42a
commit 3cff443d38
5 changed files with 9 additions and 3 deletions

View File

@ -40,7 +40,9 @@
<variable name='activer_market_place' type='oui/non' description="Activer l'utilisation d'une place de marché distante" mode='expert'> <variable name='activer_market_place' type='oui/non' description="Activer l'utilisation d'une place de marché distante" mode='expert'>
<value>non</value> <value>non</value>
</variable> </variable>
<variable name='market_place_url' type='web_address' description="Adresse de la place de marché distante" mode='expert'/> <variable name='market_place_url' type='web_address' description="Adresse de la place de marché distante" mode='expert' mandatory="True">
<value>http://marketplace.c12g.com/appliance</value>
</variable>
<variable name='activer_market_views' type='oui/non' description="Activer l'intégration AppMarket dans Sunstone" mode="expert"> <variable name='activer_market_views' type='oui/non' description="Activer l'intégration AppMarket dans Sunstone" mode="expert">
<value>non</value> <value>non</value>
</variable> </variable>

View File

@ -16,7 +16,9 @@ enabled_tabs:
hosts-tab: true hosts-tab: true
datastores-tab: true datastores-tab: true
vnets-tab: true vnets-tab: true
%if %%getVar('activer_market_place', 'non')
marketplace-tab: true marketplace-tab: true
%end if
%if %%getVar('activer_oneflow', 'non') == 'oui' %if %%getVar('activer_oneflow', 'non') == 'oui'
oneflow-dashboard: true oneflow-dashboard: true
oneflow-services: true oneflow-services: true

View File

@ -120,8 +120,6 @@
# #
%if %%getVar('activer_market_place','non') == 'oui' %if %%getVar('activer_market_place','non') == 'oui'
:marketplace_url: %%market_place_url :marketplace_url: %%market_place_url
%else
:marketplace_url: http://marketplace.c12g.com/appliance
%end if %end if
%if %%getVar('activer_oneflow', 'non') == 'oui' %if %%getVar('activer_oneflow', 'non') == 'oui'

View File

@ -17,7 +17,9 @@ available_tabs:
- datastores-tab - datastores-tab
- vnets-tab - vnets-tab
- zones-tab - zones-tab
%if %%getVar('activer_market_place', 'non')
- marketplace-tab - marketplace-tab
%end if
%if %%getVar('activer_oneflow', 'non') == 'oui' %if %%getVar('activer_oneflow', 'non') == 'oui'
- oneflow-dashboard - oneflow-dashboard
- oneflow-services - oneflow-services

View File

@ -16,7 +16,9 @@ enabled_tabs:
hosts-tab: false hosts-tab: false
datastores-tab: true datastores-tab: true
vnets-tab: true vnets-tab: true
%if %%getVar('activer_market_place', 'non')
marketplace-tab: true marketplace-tab: true
%end if
%if %%getVar('activer_oneflow', 'non') == 'oui' %if %%getVar('activer_oneflow', 'non') == 'oui'
oneflow-dashboard: true oneflow-dashboard: true
oneflow-services: true oneflow-services: true