From 3cff443d382fc3899863b3db390658ab8411a269 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 18 Nov 2014 15:04:41 +0100
Subject: [PATCH] =?UTF-8?q?dicos/99=5Fone-frontend.xml:=20Ajout=20d'une=20?=
 =?UTF-8?q?valeur=20par=20d=C3=A9faut=20pour=20market=5Fplace=5Furl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 dicos/99_one-frontend.xml | 4 +++-
 tmpl/admin.yaml           | 2 ++
 tmpl/sunstone-server.conf | 2 --
 tmpl/sunstone-views.yaml  | 2 ++
 tmpl/user.yaml            | 2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml
index bb9120c..6833d23 100644
--- a/dicos/99_one-frontend.xml
+++ b/dicos/99_one-frontend.xml
@@ -40,7 +40,9 @@
             <variable name='activer_market_place' type='oui/non' description="Activer l'utilisation d'une place de marché distante" mode='expert'>
               <value>non</value>
             </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">
                 <value>non</value>
             </variable>
diff --git a/tmpl/admin.yaml b/tmpl/admin.yaml
index 29fd494..3802382 100644
--- a/tmpl/admin.yaml
+++ b/tmpl/admin.yaml
@@ -16,7 +16,9 @@ enabled_tabs:
     hosts-tab: true
     datastores-tab: true
     vnets-tab: true
+%if %%getVar('activer_market_place', 'non')
     marketplace-tab: true
+%end if
 %if %%getVar('activer_oneflow', 'non') == 'oui'
     oneflow-dashboard: true
     oneflow-services: true
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index 542c215..880c1ee 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -120,8 +120,6 @@
 #
 %if %%getVar('activer_market_place','non') == 'oui'
 :marketplace_url: %%market_place_url
-%else 
-:marketplace_url: http://marketplace.c12g.com/appliance
 %end if
 
 %if %%getVar('activer_oneflow', 'non') == 'oui'
diff --git a/tmpl/sunstone-views.yaml b/tmpl/sunstone-views.yaml
index 2434f87..f32b66b 100644
--- a/tmpl/sunstone-views.yaml
+++ b/tmpl/sunstone-views.yaml
@@ -17,7 +17,9 @@ available_tabs:
     - datastores-tab
     - vnets-tab
     - zones-tab
+%if %%getVar('activer_market_place', 'non')
     - marketplace-tab
+%end if
 %if %%getVar('activer_oneflow', 'non') == 'oui'
     - oneflow-dashboard
     - oneflow-services
diff --git a/tmpl/user.yaml b/tmpl/user.yaml
index 4cc0aa5..4e86869 100644
--- a/tmpl/user.yaml
+++ b/tmpl/user.yaml
@@ -16,7 +16,9 @@ enabled_tabs:
     hosts-tab: false
     datastores-tab: true
     vnets-tab: true
+%if %%getVar('activer_market_place', 'non')
     marketplace-tab: true
+%end if
 %if %%getVar('activer_oneflow', 'non') == 'oui'
     oneflow-dashboard: true
     oneflow-services: true