Skip to content

S
slapos.core
Commit 1ae88498 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Merge remote-tracking branch 'origin/master' into performance-hack

parents 6c9d9c1c 04bbc8e7
Show whitespace changes
Inline Side-by-side
Showing with 1056 additions and 32 deletions
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibEmailConstraint/email_unicity_constraint.xml
View file @ 1ae88498
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</item> </item>
<item> <item>
<key> <string>test_tales_expression</string> </key> <key> <string>test_tales_expression</string> </key>
<value> <string>python: object.getCoordinateText("") != ""</string> </value> <value> <string>python: object.getCoordinateText("") != "" and context.getValidationState() != \'cancelled\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/aggregate_category_membership_arity_constraint.xml
View file @ 1ae88498
...@@ -40,10 +40,22 @@ ...@@ -40,10 +40,22 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>aggregate_category_membership_arity_constraint</string> </value> <value> <string>aggregate_category_membership_arity_constraint</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>max_arity</string> </key> <key> <string>max_arity</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
</item> </item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>message_arity_not_in_range</string> </key> <key> <string>message_arity_not_in_range</string> </key>
<value> <string>One Software Product must be defined</string> </value> <value> <string>One Software Product must be defined</string> </value>
...@@ -68,9 +80,21 @@ ...@@ -68,9 +80,21 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Category Membership Arity Constraint</string> </value> <value> <string>Category Membership Arity Constraint</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>test_tales_expression</string> </key> <key> <string>test_tales_expression</string> </key>
<value> <string>python: object.getValidationState() != \'draft\'</string> </value> <value> <string>python: object.getValidationState() not in (\'draft\' , \'cancelled\')</string> </value>
</item> </item>
<item> <item>
<key> <string>use_acquisition</string> </key> <key> <string>use_acquisition</string> </key>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/aggregate_state_constraint.xml
View file @ 1ae88498
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</item> </item>
<item> <item>
<key> <string>test_tales_expression</string> </key> <key> <string>test_tales_expression</string> </key>
<value> <string>python: object.getValidationState() != \'draft\'</string> </value> <value> <string>python: object.getValidationState() not in (\'draft\', \'cancelled\')</string> </value>
</item> </item>
<item> <item>
<key> <string>workflow_state_list</string> </key> <key> <string>workflow_state_list</string> </key>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/contributor_state_constraint.xml
View file @ 1ae88498
...@@ -32,6 +32,18 @@ ...@@ -32,6 +32,18 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>contributor_state_constraint</string> </value> <value> <string>contributor_state_constraint</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>membership_portal_type_list</string> </key> <key> <string>membership_portal_type_list</string> </key>
<value> <string>python: (\'Person\',)</string> </value> <value> <string>python: (\'Person\',)</string> </value>
...@@ -44,6 +56,22 @@ ...@@ -44,6 +56,22 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Category Membership State Constraint</string> </value> <value> <string>Category Membership State Constraint</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getValidationState() != \'cancelled\'</string> </value>
</item>
<item> <item>
<key> <string>workflow_state_list</string> </key> <key> <string>workflow_state_list</string> </key>
<value> <string>python: \'validated\'</string> </value> <value> <string>python: \'validated\'</string> </value>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/language_not_empty_constraint.xml
View file @ 1ae88498
...@@ -53,6 +53,18 @@ ...@@ -53,6 +53,18 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>language_not_empty_constraint</string> </value> <value> <string>language_not_empty_constraint</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>message_attribute_match</string> </key> <key> <string>message_attribute_match</string> </key>
<value> <string>Language should be defined</string> </value> <value> <string>Language should be defined</string> </value>
...@@ -69,6 +81,22 @@ ...@@ -69,6 +81,22 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>String Attribute Match Constraint</string> </value> <value> <string>String Attribute Match Constraint</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getValidationState() != \'cancelled\'</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/reference_not_empty_constraint.xml
View file @ 1ae88498
...@@ -53,6 +53,18 @@ ...@@ -53,6 +53,18 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>reference_not_empty_constraint</string> </value> <value> <string>reference_not_empty_constraint</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>message_attribute_match</string> </key> <key> <string>message_attribute_match</string> </key>
<value> <string>Reference must be defined</string> </value> <value> <string>Reference must be defined</string> </value>
...@@ -69,6 +81,22 @@ ...@@ -69,6 +81,22 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>String Attribute Match Constraint</string> </value> <value> <string>String Attribute Match Constraint</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getValidationState() != \'cancelled\'</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/url_not_empty_constraint.xml
View file @ 1ae88498
...@@ -53,6 +53,18 @@ ...@@ -53,6 +53,18 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>url_not_empty_constraint</string> </value> <value> <string>url_not_empty_constraint</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>message_attribute_match</string> </key> <key> <string>message_attribute_match</string> </key>
<value> <string>URL must be defined</string> </value> <value> <string>URL must be defined</string> </value>
...@@ -69,6 +81,22 @@ ...@@ -69,6 +81,22 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>String Attribute Match Constraint</string> </value> <value> <string>String Attribute Match Constraint</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getValidationState() != \'cancelled\'</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/url_unicity_constraint.xml
View file @ 1ae88498
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</item> </item>
<item> <item>
<key> <string>test_tales_expression</string> </key> <key> <string>test_tales_expression</string> </key>
<value> <string>python: object.getUrlString("") != ""</string> </value> <value> <string>python: object.getUrlString("") != "" and context.getValidationState() != \'cancelled\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/version_not_empty_constraint.xml
View file @ 1ae88498
...@@ -53,6 +53,18 @@ ...@@ -53,6 +53,18 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>version_not_empty_constraint</string> </value> <value> <string>version_not_empty_constraint</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>message_attribute_match</string> </key> <key> <string>message_attribute_match</string> </key>
<value> <string>Version should be defined</string> </value> <value> <string>Version should be defined</string> </value>
...@@ -69,6 +81,22 @@ ...@@ -69,6 +81,22 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>String Attribute Match Constraint</string> </value> <value> <string>String Attribute Match Constraint</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getValidationState() != \'cancelled\'</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint/version_unicity_constraint.xml
View file @ 1ae88498
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</item> </item>
<item> <item>
<key> <string>test_tales_expression</string> </key> <key> <string>test_tales_expression</string> </key>
<value> <string>python: object.getVersion("") != ""</string> </value> <value> <string>python: object.getVersion("") != "" and context.getValidationState() != \'cancelled\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_erp5/bt/revision
View file @ 1ae88498
394 395
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_open_trade/SkinTemplateItem/portal_skins/vifib_open_trade/OpenSaleOrderLine_getSoftwareInstanceList.xml
View file @ 1ae88498
...@@ -50,26 +50,17 @@ ...@@ -50,26 +50,17 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>subscription_item = context.getAggregateValue(portal_type="Hosting Subscription")\n <value> <string>portal = context.getPortalObject()\n
subscription_item = context.getAggregateValue(portal_type="Hosting Subscription")\n
\n \n
line_list = context.portal_catalog(\n line_list = context.portal_catalog(\n
portal_type="Sale Packing List Line",\n portal_type=["Sale Order Line", "Sale Packing List Line"],\n
resource_relative_url=context.portal_preferences.getPreferredInstanceSetupResource(),\n default_resource_uid=portal.restrictedTraverse(context.portal_preferences.getPreferredInstanceSetupResource()).getUid(),\n
aggregate_uid=subscription_item.getUid())\n default_aggregate_uid=subscription_item.getUid())\n
\n
order_line_list = context.portal_catalog( \n
portal_type="Sale Order Line",\n
resource_relative_url=context.portal_preferences.getPreferredInstanceSetupResource(),\n
aggregate_relative_url=subscription_item.getRelativeUrl(),\n
simulation_state="ordered")\n
\n
# XXX order line has to display (as order is under approval)\n
\n \n
portal_type_list = ["Software Instance", "Slave Instance"]\n portal_type_list = ["Software Instance", "Slave Instance"]\n
result = [x.getAggregateValue(portal_type=portal_type_list) for x in line_list]\n instance_dict = dict([(x.getAggregate(portal_type=portal_type_list), 0) for x in line_list])\n
result.extend([x.getAggregateValue(portal_type=portal_type_list) for x in order_line_list])\n return [portal.restrictedTraverse(x) for x in instance_dict.keys()]\n
# result.extend([x.getObject() for x in order_line_list])\n
return result\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
master/bt5/vifib_open_trade/bt/revision
View file @ 1ae88498
166 167
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SoftwareInstance_getInstancePackingListLine.xml
View file @ 1ae88498
...@@ -80,7 +80,7 @@ state_list.extend(portal.getPortalTransitInventoryStateList())\n ...@@ -80,7 +80,7 @@ state_list.extend(portal.getPortalTransitInventoryStateList())\n
state_list.extend(portal.getPortalCurrentInventoryStateList())\n state_list.extend(portal.getPortalCurrentInventoryStateList())\n
\n \n
packing_list_line = portal.portal_catalog.getResultValue(\n packing_list_line = portal.portal_catalog.getResultValue(\n
portal_type=\'Sale Packing List Line\',\n portal_type=portal_type,\n
simulation_state=state_list,\n simulation_state=state_list,\n
aggregate_uid=software_instance.getUid(),\n aggregate_uid=software_instance.getUid(),\n
default_resource_uid=service_uid_list,\n default_resource_uid=service_uid_list,\n
...@@ -95,7 +95,7 @@ return packing_list_line\n ...@@ -95,7 +95,7 @@ return packing_list_line\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>service_relative_url=None</string> </value> <value> <string>service_relative_url=None, portal_type="Sale Packing List Line"</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SoftwareInstance_getStatus.xml
View file @ 1ae88498
...@@ -56,7 +56,11 @@ if context.getPortalType() == "Sale Order Line":\n ...@@ -56,7 +56,11 @@ if context.getPortalType() == "Sale Order Line":\n
\n \n
sale_packing_list_line = context.SoftwareInstance_getInstancePackingListLine()\n sale_packing_list_line = context.SoftwareInstance_getInstancePackingListLine()\n
if sale_packing_list_line is None:\n if sale_packing_list_line is None:\n
return \'Destroyed\'\n sale_packing_list_line = context.SoftwareInstance_getInstancePackingListLine(portal_type="Sale Order Line")\n
if sale_packing_list_line is None:\n
# Let\'s hope the sale order is not indexed yet\n
return \'Looking for a free partition\'\n
\n
service_url = sale_packing_list_line.getResource()\n service_url = sale_packing_list_line.getResource()\n
\n \n
portal_preferences = context.getPortalObject().portal_preferences\n portal_preferences = context.getPortalObject().portal_preferences\n
...@@ -64,8 +68,12 @@ simulation_state = sale_packing_list_line.getSimulationState()\n ...@@ -64,8 +68,12 @@ simulation_state = sale_packing_list_line.getSimulationState()\n
if service_url == portal_preferences.getPreferredInstanceSetupResource():\n if service_url == portal_preferences.getPreferredInstanceSetupResource():\n
if simulation_state == \'delivered\':\n if simulation_state == \'delivered\':\n
return \'Destroyed\'\n return \'Destroyed\'\n
elif simulation_state in (\'confirmed\', \'started\'):\n elif simulation_state in (\'confirmed\', ):\n
return \'Waiting for partition instanciation\'\n
elif simulation_state in (\'started\', ):\n
return \'Instanciation in progress\'\n return \'Instanciation in progress\'\n
elif simulation_state in (\'ordered\', ):\n
return \'Looking for a free partition\'\n
return \'Stopped\'\n return \'Stopped\'\n
elif service_url == portal_preferences.getPreferredInstanceCleanupResource():\n elif service_url == portal_preferences.getPreferredInstanceCleanupResource():\n
if simulation_state == \'delivered\':\n if simulation_state == \'delivered\':\n
...@@ -80,8 +88,8 @@ elif service_url == portal_preferences.getPreferredInstanceHostingResource():\n ...@@ -80,8 +88,8 @@ elif service_url == portal_preferences.getPreferredInstanceHostingResource():\n
return \'Stop in progress\'\n return \'Stop in progress\'\n
elif simulation_state == \'delivered\':\n elif simulation_state == \'delivered\':\n
return \'Stopped\'\n return \'Stopped\'\n
else:\n \n
return \'Unknown\'\n return \'Unable to calculate the status...\'\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
master/bt5/vifib_slap/bt/revision
View file @ 1ae88498
590 592
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstanceConnectionKey_renderURL.xml 0 → 100644
View file @ 1ae88498
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>v = context.getProperty(\'connection_key\')\n
\n
if v is not None and v.startswith(\'http:\') or v.startswith(\'https:\'):\n
return v\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SoftwareInstanceConnectionKey_renderURL</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstanceConnectionValue_renderURL.xml 0 → 100644
View file @ 1ae88498
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>v = context.getProperty(\'connection_value\')\n
\n
if v is not None and v.startswith(\'http\'):\n
return v\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SoftwareInstanceConnectionValue_renderURL</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_getConnectionParameterList.xml 0 → 100644
View file @ 1ae88498
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Document import newTempDocument\n
\n
return_list = []\n
try:\n
connection_dict = context.getConnectionXmlAsDict()\n
except:\n
return return_list\n
\n
if connection_dict is None:\n
return return_list\n
\n
portal = context.getPortalObject()\n
for k, v in connection_dict.iteritems():\n
d = newTempDocument(portal, \'temp\')\n
d.edit(connection_key=k, connection_value=v)\n
return_list.append(d)\n
return return_list\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kwargs</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SoftwareInstance_getConnectionParameterList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml
View file @ 1ae88498
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<key> <string>normal bis</string> </key> <key> <string>normal bis</string> </key>
<value> <value>
<list> <list>
<string>your_connection_xml</string> <string>your_connection_listbox</string>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/your_connection_xml.xml → master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb/your_connection_listbox.xml
View file @ 1ae88498
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="TextAreaField" module="Products.Formulator.StandardFields"/> <global name="ListBox" module="Products.ERP5Form.ListBox"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>your_connection_xml</string> </value> <value> <string>your_connection_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -18,22 +18,10 @@ ...@@ -18,22 +18,10 @@
<key> <string>external_validator_failed</string> </key> <key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value> <value> <string>The input failed the external validator.</string> </value>
</item> </item>
<item>
<key> <string>line_too_long</string> </key>
<value> <string>A line was too long.</string> </value>
</item>
<item> <item>
<key> <string>required_not_found</string> </key> <key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value> <value> <string>Input is required but no input given.</string> </value>
</item> </item>
<item>
<key> <string>too_long</string> </key>
<value> <string>You entered too many characters.</string> </value>
</item>
<item>
<key> <string>too_many_lines</string> </key>
<value> <string>You entered too many lines.</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -41,26 +29,62 @@ ...@@ -41,26 +29,62 @@
<key> <string>overrides</string> </key> <key> <string>overrides</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>anchor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default_display_style</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_params</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>display_style_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -70,11 +94,11 @@ ...@@ -70,11 +94,11 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>global_attributes</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>global_search_column</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -82,35 +106,95 @@ ...@@ -82,35 +106,95 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_linelength</string> </key> <key> <string>lines</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>list_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>meta_types</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>page_navigation_template</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>page_template</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>width</string> </key> <key> <string>portal_types</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>row_css_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>select</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>stat_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>stat_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>style_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>untranslatable_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -120,42 +204,78 @@ ...@@ -120,42 +204,78 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>anchor</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default_display_style</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </item>
</value> <item>
<key> <string>default_params</string> </key>
<value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>display_style_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>editable_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>global_attributes</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>global_search_column</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -163,35 +283,95 @@ ...@@ -163,35 +283,95 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_linelength</string> </key> <key> <string>lines</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>list_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>meta_types</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>page_navigation_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>row_css_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>select</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>stat_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>stat_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>width</string> </key> <key> <string>style_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>untranslatable_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -201,26 +381,83 @@ ...@@ -201,26 +381,83 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>alternate_name</string> </key> <key> <string>alternate_name</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>anchor</string> </key>
<value> <string>inline</string> </value> <value> <int>0</int> </value>
</item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>connection_key</string>
<string>Key</string>
</tuple>
<tuple>
<string>connection_value</string>
<string>Value</string>
</tuple>
</list>
</value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>count_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default_display_style</string> </key>
<value> <string>table</string> </value>
</item>
<item>
<key> <string>default_params</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>display_style_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -230,48 +467,141 @@ ...@@ -230,48 +467,141 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>global_attributes</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>global_search_column</string> </key>
<value> <int>5</int> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>max_length</string> </key> <key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>lines</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>list_action</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_linelength</string> </key> <key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>meta_types</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>page_navigation_template</string> </key>
<value> <string>ListBox_viewSliderPageNavigationRenderer</string> </value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>max_lines</string> </key> <key> <string>portal_types</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>row_css_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>search</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>search_columns</string> </key>
<value> <string>Connection XML</string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>select</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>whitespace_preserve</string> </key> <key> <string>selection_name</string> </key>
<value> <int>1</int> </value> <value> <string>software_instance_connection_selection</string> </value>
</item> </item>
<item> <item>
<key> <string>width</string> </key> <key> <string>sort</string> </key>
<value> <int>40</int> </value> <value>
<list/>
</value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>stat_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>stat_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>style_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Connection Parameters</string> </value>
</item>
<item>
<key> <string>untranslatable_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
<string>connection_key</string>
<string>SoftwareInstanceConnectionKey_renderURL</string>
</tuple>
<tuple>
<string>connection_value</string>
<string>SoftwareInstanceConnectionValue_renderURL</string>
</tuple>
</list>
</value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -287,7 +617,20 @@ ...@@ -287,7 +617,20 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: context.getConnectionXml()</string> </value> <value> <string>context/getConnectionXmlAsDict</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>SoftwareInstance_getConnectionParameterList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_web/bt/revision
View file @ 1ae88498
328 330
\ No newline at end of file \ No newline at end of file
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