diff --git a/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.py b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.py index 51cee562b86691228bb55bbeac88baff53acd8be..1efc25d614e3afa38b272c8d90349093a0381690 100644 --- a/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.py +++ b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.py @@ -30,6 +30,12 @@ class TestSuite(XMLObject, PeriodicityMixin): return portal.portal_task_distribution.getMemcachedDict().get( "%s_ping_date" % (self.getRelativeUrl())) + security.declareProtected(Permissions.AccessContentsInformation, 'getSlapOSInstanceParameterSchemaURL') + def getSlapOSInstanceParameterSchemaURL(self): + """ + """ + return "https://lab.nexedi.com/nexedi/slapos/raw/master/software/erp5/instance-erp5-input-schema.json" + # Compatibility Code to be removed after 06/2018, since all instances using # test suites should be migrated at that time. Purpose here was to fix the # setting of some properties that were defined with type "lines" instead of "string". diff --git a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view.xml b/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view.xml index f0628b6b0f41ca5bd1d0e4ec532ff655ad9c49fd..24ed0e30e3ec3d419d264a88a5ff967186a1bc97 100644 --- a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view.xml +++ b/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view.xml @@ -83,9 +83,10 @@ <key> <string>center</string> </key> <value> <list> - <string>my_cluster_configuration</string> + <string>my_cluster_configurationx</string> <string>my_enabled</string> <string>my_alarm_date</string> + <string>my_cluster_configuration</string> </list> </value> </item> diff --git a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configuration.xml b/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configuration.xml index 49af22d336491aa6d1cfb4b7e54d38ad1779fdb6..dc316ec29d88427875b1d78419b5a85e27dd69c5 100644 --- a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configuration.xml +++ b/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configuration.xml @@ -2,7 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <global name="TextAreaField" module="Products.Formulator.StandardFields"/> + <global name="GadgetField" module="Products.ERP5Form.GadgetField"/> </pickle> <pickle> <dictionary> @@ -16,23 +16,11 @@ <dictionary> <item> <key> <string>external_validator_failed</string> </key> - <value> <string>Please use correct JSON syntax.</string> </value> + <value> <string>The input failed the external validator.</string> </value> </item> <item> - <key> <string>line_too_long</string> </key> - <value> <string>A line was too long.</string> </value> - </item> - <item> - <key> <string>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </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> + <key> <string>no_validator</string> </key> + <value> <string>Does not support this operation.</string> </value> </item> </dictionary> </value> @@ -49,6 +37,10 @@ <key> <string>css_class</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>data_url</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>default</string> </key> <value> <string></string> </value> @@ -74,7 +66,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>height</string> </key> + <key> <string>gadget_url</string> </key> <value> <string></string> </value> </item> <item> @@ -82,19 +74,11 @@ <value> <string></string> </value> </item> <item> - <key> <string>max_length</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</string> </key> + <key> <string>js_sandbox</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>required</string> </key> + <key> <string>renderjs_extra</string> </key> <value> <string></string> </value> </item> <item> @@ -102,15 +86,11 @@ <value> <string></string> </value> </item> <item> - <key> <string>unicode</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>whitespace_preserve</string> </key> + <key> <string>validator_field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>width</string> </key> + <key> <string>validator_form_id</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -128,6 +108,10 @@ <key> <string>css_class</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>data_url</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>default</string> </key> <value> <string></string> </value> @@ -153,7 +137,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>height</string> </key> + <key> <string>gadget_url</string> </key> <value> <string></string> </value> </item> <item> @@ -161,35 +145,25 @@ <value> <string></string> </value> </item> <item> - <key> <string>max_length</string> </key> + <key> <string>js_sandbox</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>max_linelength</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>max_lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> + <key> <string>renderjs_extra</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>unicode</string> </key> + <key> <string>validator_field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>whitespace_preserve</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>width</string> </key> + <key> <string>validator_form_id</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -207,24 +181,17 @@ <key> <string>css_class</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>data_url</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Slapos parameters.\n -\n -Configuration structure has to look like a python dict, ex:\n -\n -{\n -"x": "xxx",\n -"y":{\n -"q": "qqq",\n -"r": "rrr"\n -},\n -"z", "zzz"\n -}</string> </value> + <value> <string></string> </value> </item> <item> <key> <string>editable</string> </key> @@ -236,53 +203,41 @@ Configuration structure has to look like a python dict, ex:\n </item> <item> <key> <string>external_validator</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>extra</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>height</string> </key> - <value> <int>10</int> </value> + <key> <string>gadget_url</string> </key> + <value> <string>react-jsonschema-form-gadget.html</string> </value> </item> <item> <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> <item> - <key> <string>max_length</string> </key> + <key> <string>js_sandbox</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>max_linelength</string> </key> - <value> <int>80</int> </value> - </item> - <item> - <key> <string>max_lines</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> + <key> <string>renderjs_extra</string> </key> + <value> + <list/> + </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Slapos Parameters</string> </value> - </item> - <item> - <key> <string>unicode</string> </key> - <value> <int>0</int> </value> + <value> <string>SlapOS Parameters</string> </value> </item> <item> - <key> <string>whitespace_preserve</string> </key> - <value> <int>1</int> </value> + <key> <string>validator_field_id</string> </key> + <value> <string></string> </value> </item> <item> - <key> <string>width</string> </key> - <value> <int>80</int> </value> + <key> <string>validator_form_id</string> </key> + <value> <string></string> </value> </item> </dictionary> </value> @@ -292,13 +247,13 @@ Configuration structure has to look like a python dict, ex:\n </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <global name="Method" module="Products.Formulator.MethodField"/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> <item> - <key> <string>method_name</string> </key> - <value> <string>Base_validateJSON</string> </value> + <key> <string>_text</string> </key> + <value> <string>python: [(\'schema\', context.getSlapOSInstanceParameterSchemaURL())]</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configurationx.xml b/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configurationx.xml new file mode 100644 index 0000000000000000000000000000000000000000..5f64512dbc97d748b2d5fab84dd1c62dc5d9f97f --- /dev/null +++ b/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/TestSuite_view/my_cluster_configurationx.xml @@ -0,0 +1,306 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="TextAreaField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>my_cluster_configurationx</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>Please use correct JSON syntax.</string> </value> + </item> + <item> + <key> <string>line_too_long</string> </key> + <value> <string>A line was too long.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </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> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Slapos parameters.\n +\n +Configuration structure has to look like a python dict, ex:\n +\n +{\n +"x": "xxx",\n +"y":{\n +"q": "qqq",\n +"r": "rrr"\n +},\n +"z", "zzz"\n +}</string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>height</string> </key> + <value> <int>10</int> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_linelength</string> </key> + <value> <int>80</int> </value> + </item> + <item> + <key> <string>max_lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Slapos Parameters</string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>width</string> </key> + <value> <int>80</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="Method" module="Products.Formulator.MethodField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>method_name</string> </key> + <value> <string>Base_validateJSON</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData>