Skip to content

S
slapos.core
Commit 96e66d22 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Minor changes and fixes 

See merge request !492
parents ed917724 aa8d5ae2
Pipeline #26696 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 24 additions and 263 deletions
    master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/SupportRequest_getInstanceMessageList.py
    View file @ 96e66d22
    ......@@ -40,11 +40,11 @@ if aggregate_portal_type == "Instance Tree":
    pasth=instance.getRelativeUrl(),
    uid=instance.getUid(),
    title= instance.getTitle(),
    specialise_title= instance_tree.getTitle(),
    software_release= instance.getUrlString(),
    compute_node_reference= compute_node.getReference(),
    allocation_scope= compute_node.getAllocationScope(),
    follow_up_title= context.getFollowUpTitle(),
    specialise_title=instance_tree.getTitle(),
    software_release=instance.getUrlString(),
    compute_node_reference=compute_node.getReference(),
    allocation_scope=compute_node.getAllocationScope(),
    follow_up_title=context.getFollowUpTitle(),
    message=m,
    created_at=create_at,
    since=since,
    ......
    master/bt5/slapos_jio/ActionTemplateItem/portal_types/Compute%20Node/new_ticket.xml deleted 100644 → 0
    View file @ ed917724
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>action_type/object_jio_action</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>category</string> </key>
    <value> <string>object_jio_action</string> </value>
    </item>
    <item>
    <key> <string>condition</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>icon</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>new_ticket</string> </value>
    </item>
    <item>
    <key> <string>permissions</string> </key>
    <value>
    <tuple>
    <string>View</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Action Information</string> </value>
    </item>
    <item>
    <key> <string>priority</string> </key>
    <value> <float>0.5</float> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>New Ticket</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    <value> <int>1</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/ComputeNode_viewNewTicketDialog</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_jio/ActionTemplateItem/portal_types/Compute%20Node/request_certificate_action.xml deleted 100644 → 0
    View file @ ed917724
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>action_type/object_jio_action</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>category</string> </key>
    <value> <string>object_jio_action</string> </value>
    </item>
    <item>
    <key> <string>condition</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>icon</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>request_certificate_action</string> </value>
    </item>
    <item>
    <key> <string>permissions</string> </key>
    <value>
    <tuple>
    <string>View</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Action Information</string> </value>
    </item>
    <item>
    <key> <string>priority</string> </key>
    <value> <float>0.5</float> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Request Certificate</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    <value> <int>1</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/ComputeNode_viewCertificateRequestDialog</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_jio/ActionTemplateItem/portal_types/Compute%20Node/revoke_certificate.xml deleted 100644 → 0
    View file @ ed917724
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>action_type/object_jio_action</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>category</string> </key>
    <value> <string>object_jio_action</string> </value>
    </item>
    <item>
    <key> <string>condition</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>icon</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>revoke_certificate</string> </value>
    </item>
    <item>
    <key> <string>permissions</string> </key>
    <value>
    <tuple>
    <string>View</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Action Information</string> </value>
    </item>
    <item>
    <key> <string>priority</string> </key>
    <value> <float>0.4</float> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Revoke Certificate</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    <value> <int>1</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/ComputeNode_viewRevokeComputeNodeCertificate</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_jio/bt/template_action_path_list
    View file @ 96e66d22
    ......@@ -2,9 +2,6 @@ Accounting Transaction Module | slaposjs_view
    Category | slaposjs_view
    Cloud Contract | slaposjs_view
    Compute Node Module | slaposjs_view
    Compute Node | new_ticket
    Compute Node | request_certificate_action
    Compute Node | revoke_certificate
    Compute Node | slaposjs_view
    Computer Network Module | slaposjs_view
    Computer Network | slaposjs_view
    ......
    master/bt5/slapos_subscription_request/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSSubscriptionRequest.py
    View file @ 96e66d22
    ......@@ -44,6 +44,9 @@ def SubscriptionRequest_searchExistingUserByEmail(self, email, REQUEST=None):
    raise Unauthorized
    portal = self.getPortalObject()
    if email in ["", None]:
    return
    erp5_login_list = portal.portal_catalog.unrestrictedSearchResults(
    portal_type="ERP5 Login",
    reference=email,
    ......
    master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequestModule_requestSubscriptionProxy.py
    View file @ 96e66d22
    ......@@ -6,6 +6,22 @@ if REQUEST is not None:
    portal = context.getPortalObject()
    web_site = context.getWebSiteValue()
    if email in ["", None]:
    error = "Email must be provided"
    base_url = context.getWebSectionValue().absolute_url()
    redirect_url = "%s?field_your_reservation_name=%s&field_your_reservation_email=%s&field_your_reservation_number_of_machines=%s&field_your_reservation_network=%s&field_your_reservation_invitation_token=%s&portal_status_message=%s" % (
    base_url,
    user_input_dict['name'],
    email,
    user_input_dict["amount"],
    subscription_reference,
    token,
    error
    )
    return context.REQUEST.RESPONSE.redirect(redirect_url)
    if token:
    error = ""
    try:
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7