From 49a888c431eb453e42a4bd430af9e742a3e55ea1 Mon Sep 17 00:00:00 2001 From: Douglas Camata Date: Thu, 15 Sep 2016 11:21:08 +0000 Subject: [PATCH] erp5_test_result: test suite's view my_cluster_configuration now has unlimited size Before this it had a line length limit of 80 characters. A proxy field was created for generic text areas with JSON content that includes an external validator and proper error message for invalid JSON. --- .../my_cluster_configuration.xml | 241 ++---------------- .../erp5_core}/Base_validateJSON.py | 0 .../erp5_core}/Base_validateJSON.xml | 0 .../my_view_mode_json_text_area.xml | 112 ++++++++ 4 files changed, 132 insertions(+), 221 deletions(-) rename {bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result => product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core}/Base_validateJSON.py (100%) rename {bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result => product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core}/Base_validateJSON.xml (100%) create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_view_mode_json_text_area.xml 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 49af22d3364..9d66d6a07e7 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,10 +2,20 @@ - + + + delegated_list + + + description + height + title + + + id my_cluster_configuration @@ -16,23 +26,7 @@ external_validator_failed - Please use correct JSON syntax. - - - line_too_long - A line was too long. - - - required_not_found - Input is required but no input given. - - - too_long - You entered too many characters. - - - too_many_lines - You entered too many lines. + The input failed the external validator. @@ -42,75 +36,11 @@ - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - title + field_id - unicode - - - - whitespace_preserve - - - - width + form_id @@ -121,75 +51,11 @@ - alternate_name - - - - css_class + field_id - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - title - - - - unicode - - - - whitespace_preserve - - - - width + form_id @@ -199,18 +65,6 @@ values - - alternate_name - - - - css_class - - - - default - - description Slapos parameters.\n @@ -227,80 +81,25 @@ Configuration structure has to look like a python dict, ex:\n } - editable - 1 - - - enabled - 1 + field_id + my_view_mode_json_text_area - external_validator - - AAAAAAAAAAI= - - - - extra - + form_id + Base_viewFieldLibrary height 10 - - hidden - 0 - - - max_length - - - - max_linelength - 80 - - - max_lines - - - - required - 0 - title Slapos Parameters - - unicode - 0 - - - whitespace_preserve - 1 - - - width - 80 - - - - - - - - - method_name - Base_validateJSON - - - - diff --git a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/Base_validateJSON.py b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateJSON.py similarity index 100% rename from bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/Base_validateJSON.py rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateJSON.py diff --git a/bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/Base_validateJSON.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateJSON.xml similarity index 100% rename from bt5/erp5_test_result/SkinTemplateItem/portal_skins/erp5_test_result/Base_validateJSON.xml rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateJSON.xml diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_view_mode_json_text_area.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_view_mode_json_text_area.xml new file mode 100644 index 00000000000..6ef3590a005 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_view_mode_json_text_area.xml @@ -0,0 +1,112 @@ + + + + + + + + + + delegated_list + + + external_validator + height + + + + + delegated_message_list + + + external_validator_failed + + + + + id + my_view_mode_json_text_area + + + message_values + + + + external_validator_failed + Please use correct JSON syntax. + + + + + + overrides + + + + field_id + + + + form_id + + + + + + + tales + + + + field_id + + + + form_id + + + + + + + values + + + + external_validator + + AAAAAAAAAAI= + + + + field_id + my_text_area_field + + + form_id + Base_viewFieldLibrary + + + height + 10 + + + + + + + + + + + + + + + method_name + Base_validateJSON + + + + + -- 2.30.9