slapos_jio: Implement error handling for request Hosting Subscription

master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_hosting_subscription_js.js

@@ -55,6 +55,14 @@
                   return gadget.redirect({"command": "change",
                                     "options": {"jio_key": "/", "page": "slap_service_list"}});
                 });
+            }, function (error) {
+              if (error.target.status === 409) {
+                return gadget.notifySubmitted({message: 'A service with this title already exists.', status: 'error'});
+              }
+              if (error.target.status === 400) {
+                return gadget.notifySubmitted({message: 'Service Title is mandatory.', status: 'error'});
+              }
+              
             });
         });
     })
@@ -65,7 +73,7 @@
 
     .declareMethod("render", function (options) {
       var gadget = this;
-      return RSVP.Queue()
+      return new RSVP.Queue()
         .push(function () {
           return RSVP.all([
             gadget.getDeclaredGadget('form_view'),

master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_hosting_subscription_js.xml

@@ -274,7 +274,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>981.35383.15103.35259</string> </value>
+                <value> <string>982.17545.17272.64904</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -292,7 +292,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1580513887.37</float>
+                        <float>1583203969.98</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareRelease_requestHostingSubscription.py

+from zExceptions import Unauthorized
+if REQUEST is None:
+  raise Unauthorized
+
 import json
 portal = context.getPortalObject()
 
+response = REQUEST.RESPONSE
+
+
 if shared in ["true", "1", 1]:
   shared = True
 
@@ -8,7 +15,8 @@ if shared in ["false", "", 0, "0", None]:
   shared = False
 
 if not title:
-  raise ValueError("Service Title is mandatory!")
+  response.setStatus(400)
+  return "Service Title is mandatory!"
 
 if "{uid}" in title:
   uid_ = portal.portal_ids.generateNewId(id_group=("vifib", "kvm"), default=1)
@@ -21,7 +29,8 @@ hosting_subscription = portal.portal_catalog.getResultValue(
   )
 
 if hosting_subscription is not None:
-  raise ValueError("Instance with this name already exists")
+  response.setStatus(409)
+  return "Instance with this name already exists"
 
 # The URL should come from the URL Probably
 url = context.getUrlString()
@@ -29,7 +38,7 @@ url = context.getUrlString()
 person = portal.portal_membership.getAuthenticatedMember().getUserValue()
 
 if person is None:
-  raise ValueError("You cannot request without been logged in as a user.")
+  raise Unauthorized("You cannot request without been logged in as a user.")
 
 if software_type in [None, ""]:
   software_type = "RootSoftwareInstance"
@@ -63,5 +72,4 @@ if sla_xml:
 </instance>""" % sla_xml
 
 person.requestSoftwareInstance(**request_kw)
-
 return json.dumps(context.REQUEST.get('request_hosting_subscription').getRelativeUrl())

master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareRelease_requestHostingSubscription.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>title, text_content="", software_type=None, shared=False, computer_guid=None, sla_xml=""</string> </value>
+            <value> <string>title, text_content="", software_type=None, shared=False, computer_guid=None, sla_xml="", REQUEST=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>