From 32a66136534eabdaba6c8064274ff90400c2beb1 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Mon, 8 Oct 2018 22:13:42 +0000
Subject: [PATCH] slapos_subscription_request: Allow associate Hosting
Subscription to Subscription Request
---
.../base_category_list.xml | 1 +
.../my_aggregate_title_list.xml | 10 +++-------
.../bt/template_portal_type_base_category_list | 1 +
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/master/bt5/slapos_subscription_request/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/master/bt5/slapos_subscription_request/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
index 8d2dc8b6c..525117236 100644
--- a/master/bt5/slapos_subscription_request/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+++ b/master/bt5/slapos_subscription_request/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
@@ -7,6 +7,7 @@
<item>business_application</item>
</portal_type>
<portal_type id="Subscription Request">
+ <item>aggregate</item>
<item>causality</item>
<item>destination_section</item>
<item>specialise</item>
diff --git a/master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_view/my_aggregate_title_list.xml b/master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_view/my_aggregate_title_list.xml
index 6a25060a7..b421bfe06 100644
--- a/master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_view/my_aggregate_title_list.xml
+++ b/master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_view/my_aggregate_title_list.xml
@@ -100,12 +100,8 @@
<value>
<list>
<tuple>
- <string>Software Instance</string>
- <string>Software Instance</string>
- </tuple>
- <tuple>
- <string>Slave Instance</string>
- <string>Slave Instance</string>
+ <string>Hosting Subscription</string>
+ <string>Hosting Subscription</string>
</tuple>
</list>
</value>
@@ -116,7 +112,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Software Instance</string> </value>
+ <value> <string>Hosting Subscription</string> </value>
</item>
</dictionary>
</value>
diff --git a/master/bt5/slapos_subscription_request/bt/template_portal_type_base_category_list b/master/bt5/slapos_subscription_request/bt/template_portal_type_base_category_list
index 91fb17d0d..d396511d5 100644
--- a/master/bt5/slapos_subscription_request/bt/template_portal_type_base_category_list
+++ b/master/bt5/slapos_subscription_request/bt/template_portal_type_base_category_list
@@ -2,6 +2,7 @@ Subscription Condition Module | business_application
Subscription Condition | aggregate
Subscription Condition | follow_up
Subscription Request Module | business_application
+Subscription Request | aggregate
Subscription Request | causality
Subscription Request | destination_section
Subscription Request | specialise
--
2.30.9