slapos_subscription_request: Fix query to catalog and allow re-apply conditions to the subscription

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_applyCondition.py

@@ -2,10 +2,19 @@ from zExceptions import Unauthorized
 if REQUEST is not None:
   raise Unauthorized
 
-subscription_condition = context.portal_catalog(
-  portal_type="Subscription Condition",
-  reference=subscription_reference,
-  validation_state="validated")
+if subscription_condition_reference is not None:
+  # It would be better use some clever API here.
+  subscription_condition = context.portal_catalog.getResultValue(
+    portal_type="Subscription Condition",
+    reference=subscription_condition_reference,
+    validation_state="validated")
+else:
+  subscription_condition = context.getSpecialiseValue()
+
+if subscription_condition is None:
+  raise ValueError(
+    "It was not possible to find the appropriate Condition %s for this Subscription" \
+      % subscription_condition_reference)
 
 # Get Subscription condition for this Subscription Request
 subscription_configuration = {

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_applyCondition.xml

@@ -50,7 +50,15 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>subscription_reference, REQUEST=None</string> </value>
+            <value> <string>subscription_condition_reference=None, REQUEST=None</string> </value>
+        </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
         </item>
         <item>
             <key> <string>id</string> </key>