diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Internal%20Packing%20List%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Order%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Purchase%20Packing%20List%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Returned%20Sale%20Packing%20List%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Order%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/item_creation.xml b/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/item_creation.xml +++ b/bt5/erp5_item/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py index f6b7f8feeaf79c15bce7c104586decc6aa9bf102..471556c4f5d0c8a9c76d22cda62d7d5c6c9a7830 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.py @@ -1,14 +1,9 @@ from Products.ERP5Type.Document import newTempDeliveryLine portal = context.getPortalObject() -try: - count = int(context.REQUEST.get('field_your_item_count', '')) -except ValueError: - count = 10 - result = [] -for i in range(count): +for i in range(item_count): obj = newTempDeliveryLine(portal, id="tmp_item_%s" % i, uid="new_item_%s" % i) result.append(obj) diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.xml index 4ad567ee36c9b57a4e462c1d64eed858f4786e5e..75c9153c1523339322b5e3783ce097872427a578 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_getTempItemList.xml @@ -50,7 +50,7 @@ _params - *args, **kw + item_count=10, *args, **kw id diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.py index 479d5d318ab6d6519c678fc2c862ef747fee8234..dd98decdb15db62ee7026681dae1d14a0d192c48 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.py +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_selectItemList.py @@ -55,8 +55,10 @@ if message: # Script stop here context.Base_updateDialogForm(listbox=listbox,update=1, kw=kw) REQUEST = portal.REQUEST - REQUEST.set('portal_status_message', message) - return getattr(context, REQUEST.form['dialog_id'])(listbox=listbox, kw=kw) + return context.Base_renderForm( + REQUEST.form['dialog_id'], + keep_items={'portal_status_message': message} + ) for item_uid in uids: item = getObject(item_uid) diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py index 0dced0fe90a93976d20d38aa88eaed9de2933347..5377667d2040e254a6e7f9fcf7dff327a7d76a2c 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_updateSelectItemListDialog.py @@ -1,9 +1,14 @@ request = context.REQUEST portal = context.getPortalObject() +Base_translateString = portal.Base_translateString # FIXME: this is a workaround, because if listbox is present in request.form, # editable fields will be empty when re-displaying the dialog. request.form.pop('listbox', None) request.other.pop('listbox', None) -return getattr(context, dialog_id)(**kw) +context.Base_updateDialogForm() +return context.Base_renderForm( + dialog_id, + keep_items={'portal_status_message': Base_translateString('Updated')} +) diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/listbox.xml index fddbf4087184793a426dab1bae5ebd3ccc84c160..8b7d2b8e8298380691b50d5f371b28fca0230d31 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/listbox.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/listbox.xml @@ -11,6 +11,7 @@ columns + default_params editable_columns lines list_method @@ -62,6 +63,12 @@ AAAAAAAAAAI= + + default_params + + AAAAAAAAAAM= + + editable_columns @@ -77,7 +84,7 @@ lines - AAAAAAAAAAM= + AAAAAAAAAAQ= @@ -130,6 +137,17 @@ + + default_params + + + + checked_permission + View + + + + editable_columns @@ -176,7 +194,7 @@ list_method - AAAAAAAAAAQ= + AAAAAAAAAAU= @@ -214,12 +232,25 @@ _text - python: 0 + python: [(\'checked_permission\', \'View\'), (\'item_count\', int(context.REQUEST.get(\'field_your_item_count\', \'10\')))] + + + + + + + _text + python: 0 + + + + + diff --git a/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Line/item_creation.xml b/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Line/item_creation.xml +++ b/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Manufacturing%20Execution%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Order%20Line/item_creation.xml b/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Order%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Order%20Line/item_creation.xml +++ b/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Order%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/item_creation.xml b/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/item_creation.xml index c032e7956fae15c14a05a1b6fd4fd7fb1b1c3372..5f6b4706129d9a806b951b18bf31e521566d30ab 100644 --- a/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/item_creation.xml +++ b/bt5/erp5_mrp_item/ActionTemplateItem/portal_types/Production%20Packing%20List%20Line/item_creation.xml @@ -16,13 +16,13 @@ categories - action_type/object_fast_input + action_type/object_jio_fast_input category - object_fast_input + object_jio_fast_input condition @@ -32,7 +32,9 @@ description - + + + icon @@ -73,7 +75,7 @@ text - string:${object_url}/DeliveryLine_viewItemCreationDialog + string:${object_url}/DeliveryLine_viewItemCreationDialog?reset:int=1 diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py deleted file mode 100644 index 39af86e4f95cbc59538f734104762c260db04efb..0000000000000000000000000000000000000000 --- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py +++ /dev/null @@ -1,55 +0,0 @@ -if REQUEST is None: - REQUEST = context.REQUEST -if response is None: - response = REQUEST.RESPONSE - -# The vanilla HTML is wanted -response.setBase(None) - -web_page = context -web_section = REQUEST.get("current_web_section") - -#if REQUEST.getHeader('If-Modified-Since', '') == web_page.getModificationDate().rfc822(): -# response.setStatus(304) -# return "" - -portal_type = web_page.getPortalType() -if portal_type in ("Web Page", "Web Script", "Web Manifest", "Web Style"): - web_content = web_page.getTextContent() -else: - if portal_type == "Web Section": - web_page = web_page.getAggregateValue() - response.setHeader('Content-Type', web_page.getContentType()) - web_content = web_page.getData() - -# set headers depending on type of script -if (portal_type == "Web Script"): - response.setHeader('Content-Type', 'application/javascript; charset=utf-8') - -elif (portal_type == "Web Style"): - response.setHeader('Content-Type', 'text/css; charset=utf-8') - -elif (portal_type == "Web Manifest"): - response.setHeader('Content-Type', 'text/cache-manifest; charset=utf-8') - -elif (portal_type == "Web Page"): - if (mapping_dict is not None): - web_content = web_page.TextDocument_substituteTextContent(web_content, mapping_dict=mapping_dict) - - content_security_policy = "default-src 'self' data: blob: *" - x_frame_options = "SAMEORIGIN" - if (web_section): - content_security_policy = web_section.getLayoutProperty("configuration_content_security_policy", default=content_security_policy) - x_frame_options = web_section.getLayoutProperty("configuration_x_frame_options", default=x_frame_options) - - # Do not allow to put inside an iframe - if not x_frame_options == "ALLOW-FROM-ALL": - response.setHeader("X-Frame-Options", x_frame_options) - response.setHeader("X-Content-Type-Options", "nosniff") - - # Only fetch code (html, js, css, image) and data from this ERP5, to prevent any data leak as the web site do not control the gadget's code - response.setHeader("Content-Security-Policy", content_security_policy) - - response.setHeader('Content-Type', web_page.getContentType('text/html')) - -return web_content diff --git a/bt5/erp5_officejs_afs_directory_data/bt/skip_coding_style_test b/bt5/erp5_officejs_afs_directory_data/bt/skip_coding_style_test deleted file mode 100644 index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000 --- a/bt5/erp5_officejs_afs_directory_data/bt/skip_coding_style_test +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/bt5/erp5_officejs_appstore_base/bt/skip_coding_style_test b/bt5/erp5_officejs_appstore_base/bt/skip_coding_style_test deleted file mode 100644 index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000 --- a/bt5/erp5_officejs_appstore_base/bt/skip_coding_style_test +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/bt5/erp5_officejs_support_request_ui/bt/skip_coding_style_test b/bt5/erp5_officejs_support_request_ui/bt/skip_coding_style_test deleted file mode 100644 index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000 --- a/bt5/erp5_officejs_support_request_ui/bt/skip_coding_style_test +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/proxy_field_zuite/testTALESBug.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/proxy_field_zuite/testTALESBug.xml new file mode 100644 index 0000000000000000000000000000000000000000..c373367aa197ff20b94a0f4400c35e53f8fa0e7b --- /dev/null +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/proxy_field_zuite/testTALESBug.xml @@ -0,0 +1,58 @@ + + + + + + + + + + _bind_names + + + + + + + + + + _asgns + + + + name_subpath + traverse_subpath + + + + + + + + + + + content_type + text/html + + + expand + 0 + + + id + testTALESBug + + + output_encoding + utf-8 + + + title + + + + + + diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/proxy_field_zuite/testTALESBug.zpt b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/proxy_field_zuite/testTALESBug.zpt new file mode 100644 index 0000000000000000000000000000000000000000..0dfa5969d724d818df127b074c633c6fa206ec52 --- /dev/null +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/proxy_field_zuite/testTALESBug.zpt @@ -0,0 +1,54 @@ + + + +Test Simple Relation Field, using metadata tab to set categories + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Test a bug
open${base_url}/foo_module/FooModule_createObjects?num:int=1
assertTextPresentCreated Successfully.
open${base_url}/foo_module/Zuite_waitForActivities
assertTextPresentDone.
open${base_url}/foo_module/0/Base_checkProxyFieldCache
verifyValuefield_your_couscous_1your_couscous_1
verifyValuefield_your_couscous_2your_couscous_2
+ + \ No newline at end of file diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache.xml new file mode 100644 index 0000000000000000000000000000000000000000..771cc50ff54a0440fc0fcf8a7069fa2e538b3493 --- /dev/null +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache.xml @@ -0,0 +1,110 @@ + + + + + + + + + + _objects + + + + + + action + + + + encoding + UTF-8 + + + enctype + + + + group_list + + + left + right + center + bottom + hidden + + + + + groups + + + + bottom + + + + + + center + + + + + + hidden + + + + + + left + + + your_couscous_2 + your_couscous_1 + + + + + right + + + + + + + + + id + Base_checkProxyFieldCache + + + method + POST + + + name + Base_checkProxyFieldCache + + + row_length + 4 + + + stored_encoding + UTF-8 + + + title + + + + unicode_mode + 0 + + + + + diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache/your_couscous_1.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache/your_couscous_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..5066d15a33bb23ae2584c240168c5e64d0668630 --- /dev/null +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache/your_couscous_1.xml @@ -0,0 +1,302 @@ + + + + + + + + + + id + your_couscous_1 + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + AAAAAAAAAAM= + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Couscous + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + python: field.id + + + + + + + + + + + + _text + python: field.id + + + + + diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache/your_couscous_2.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache/your_couscous_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..645b8581add09e89bbd4a0e7cb053df4a0d2de14 --- /dev/null +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkProxyFieldCache/your_couscous_2.xml @@ -0,0 +1,72 @@ + + + + + + + + + + id + your_couscous_2 + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + + + + overrides + + + + field_id + + + + form_id + + + + + + + tales + + + + field_id + + + + form_id + + + + + + + values + + + + field_id + your_couscous_1 + + + form_id + Base_checkProxyFieldCache + + + + + + + + diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_CommonTemplate.zpt b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_CommonTemplate.zpt index be21459eda0a4b213badd72d36b348157fb3ef42..af78879b4fab05d63aaa52677b0b6435f1777fa4 100644 --- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_CommonTemplate.zpt +++ b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_CommonTemplate.zpt @@ -3,7 +3,7 @@ setTimeout - 90000 + 40000 diff --git a/bt5/erp5_web/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_web/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml new file mode 100644 index 0000000000000000000000000000000000000000..8c7619fd343390b6fe49397270d5eda9d3891dbd --- /dev/null +++ b/bt5/erp5_web/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml @@ -0,0 +1,8 @@ + + + Static Web Section + + + Static Web Site + + \ No newline at end of file diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.py b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.py index fd90cf5ef9dcfbc9df2d0854d3392f10fe99c0af..df564bd4113fe6549acfc643aa80357feef96671 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.py +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.py @@ -1,66 +1 @@ -""" - This script is part of ERP5 Web - - ERP5 Web is a business template of ERP5 which provides a way - to create web sites which can display selected - ERP5 contents through multiple custom web layouts. - - The default implementation searches for - documents which are in the user language if any - and which reference is equal to the name parameter. - - Other implementations are possible: ex. display the last - version in the closest language rather than - the latest version in the user language. - - NOTE: - - the portal parameter was introduced to - fix acquisition issues within the _aq_dynamic - lookup from WebSection class. -""" -from Products.ZSQLCatalog.SQLCatalog import SimpleQuery, ComplexQuery -if portal is None: portal = context.getPortalObject() - -# Find the applicable language -if language is None: - language = portal.Localizer.get_selected_language() - -if validation_state is None: - validation_state = ('released', 'released_alive', 'published', 'published_alive', - 'shared', 'shared_alive', 'public', 'validated') - -if effective_date is None: - if now is None: - now = DateTime() - effective_date = ComplexQuery( - SimpleQuery(effective_date=None), - SimpleQuery(effective_date=now, comparison_operator='<='), - logical_operator='or', - ) - -# Note: In sorts, NULL is considered lesser than non-NULL. So in descending -# sort, NULLs will be listed after non-NULLs, which is perfect for -# effective_date, which defines the date at which content becomes effective. -# None (NULL) effective date hence means "effective since infinite in te past". -base_sort = (('effective_date', 'descending'), ) - -# Portal Type and validation state should be handled by predicate -# By default -document_list = context.searchResults( - reference=name, - effective_date=effective_date, - language=(language, ''), - sort_on=(('language', 'descending'), ) + base_sort, - limit=1, - **kw) - -if len(document_list) == 0: - # Default returns None - document = None -else: - # Try to get the first page on the list - document = document_list[0] - document = document.getObject() - -# return the web page -return document +return context.WebSection_getDocumentValue(name, **kw) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.xml index 121759e7a0bbee266aae5d0bd3587bc1ba4496d6..d98f8758306305335dec161c9a3da5be20657001 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/StaticWebSection_getDocumentValue.xml @@ -50,7 +50,7 @@ _params - name, portal=None, language=None, validation_state=None, effective_date=None, now=None, **kw + name, **kw id diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.py b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.py index ca9adee393e5404258e3b42690fee2b17d07877b..28c528df29dddc0f6cd0597f8fcf67eee4611c1d 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.py +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.py @@ -3,8 +3,16 @@ fix acquisition issues within the _aq_dynamic lookup from WebSection class. """ +if not name: + # Catalog does not search empty reference. + # Skip the query in such case. + return None + if portal is None: portal = context.getPortalObject() + +kw['limit'] = 1 + document_list = portal.portal_catalog.getDocumentValueList( reference=name, language=language, diff --git a/bt5/erp5_web/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_web/bt/template_portal_type_hidden_content_type_list new file mode 100644 index 0000000000000000000000000000000000000000..20637db5c7ee23fde0612ea1393d198f92f091d1 --- /dev/null +++ b/bt5/erp5_web/bt/template_portal_type_hidden_content_type_list @@ -0,0 +1,2 @@ +Web Site Module | Static Web Site +Web Site | Static Web Section \ No newline at end of file diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_html.xml index 8e03131f0dcaab1fd9e3b91b71f0cfa86e3c4c74..c871dfb1486713f7471e84958330960f20ebdecb 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509121344.39 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509121344.39 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.33813.35232.64187 - - - state - current - - - time - - - - - - - - - - - 1510936342.8 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.33813.35232.64187 + + + state + current + + + time + + + + + + + + + + + 1510936342.8 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509120951.09 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509120951.09 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js index 75e92f68c5dd43bf34082ad58b014567b8cd55ef..97c866b18382183f9636f5cc826f417d7eae53c9 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js @@ -39,7 +39,7 @@ redirect_options = { jio_key: result.data.rows[0].id }; - return gadget.redirect({"command": "index", options: redirect_options}); + return gadget.redirectByJob({"command": "index", options: redirect_options}); } redirect_options = { extended_search: gadget.state.query @@ -55,7 +55,7 @@ } else if (gadget.state.portal_type === "promise") { redirect_options.page = "ojsm_status_list"; } - return gadget.redirect({"command": "display", options: redirect_options}); + return gadget.redirectByJob({"command": "display", options: redirect_options}); }); } @@ -75,6 +75,9 @@ ///////////////////////////////////////////////////////////////// // declared methods ///////////////////////////////////////////////////////////////// + .declareJob("redirectByJob", function (options) { + return this.redirect(options); + }) .declareMethod("triggerSubmit", function () { var argument_list = arguments; return this.getDeclaredGadget('form_view') @@ -146,7 +149,7 @@ page: 'ojsm_dispatch' }) .push(function () { - return gadget.redirect({command: 'change', options: { + return gadget.redirectByJob({command: 'change', options: { page: "ojsm_erp5_configurator", type: "erp5" }}); diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml index f7c03c82e394022ac215c992ccb228067796bf7d..34a479d1f0b0f0065901efb87268dbbdd591007d 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml @@ -158,171 +158,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509121334.04 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509121334.04 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.38066.29413.61576 - - - state - current - - - time - - - - - - - - - - - 1540892674.51 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.38066.29413.61576 + + + state + current + + + time + + + + + + + + + + + 1540892674.51 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509121233.65 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509121233.65 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_html.xml index f1389b90ec114eff5bf15e915f7b4d69079cbb8b..ba5712ec48f56599a922a0ffeac633282a3c0b78 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1508247471.55 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1508247471.55 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1511257051.71 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1511257051.71 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1508247428.16 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1508247428.16 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_js.xml index 71608ad67bc31698b983e6d7b66b5e790200c3c4..3d995edecee1fc4aee6633662b0181928c230f58 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_erp5_configurator_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1508251150.88 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1508251150.88 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1511344516.01 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1511344516.01 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1508247692.75 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1508247692.75 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_html.xml index 051ce28b4f3399da838a143abcabff8ab0a49217..e33ca3599579160ac32612937f307b468da68b2e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_html.xml @@ -163,171 +163,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1457347252.5 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1457347252.5 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.48791.22929.44424 - - - state - current - - - time - - - - - - - - - - - 1507902208.04 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.48791.22929.44424 + + + state + current + + + time + + + + + + + + + + + 1507902208.04 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1457346986.01 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1457346986.01 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_js.xml index 39e55cf0400aa4e22de78355ab9f18c0e57b132d..32833d524d3ef213b79c3bca46d059bb7dca1acb 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_hosting_subscription_list_js.xml @@ -159,171 +159,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1457347208.26 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1457347208.26 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.33408.64727.5632 - - - state - current - - - time - - - - - - - - - - - 1542965869.33 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.33408.64727.5632 + + + state + current + + + time + + + + + + + + + + + 1542965869.33 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1457347073.74 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1457347073.74 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_html.xml index ac59591a4251a11d87e529d47929785447bef473..035e4cecff18aca286414671bdedeadb037d7b37 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506442401.49 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506442401.49 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.16563.15280.46899 - - - state - current - - - time - - - - - - - - - - - 1509979675.96 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.16563.15280.46899 + + + state + current + + + time + + + + + + + + + + + 1509979675.96 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506442331.2 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506442331.2 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js index 2c4906a4ad3e452829a51cca754efefffdfefd79..bb63f7e79bd28bd4df72934651e6f1a74a62c7e1 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js @@ -181,9 +181,6 @@ settings_queue .push(function () { return gadget.jio_put(id, config); - }) - .push(undefined, function (error) { - throw error; }); } if (validate_result) { @@ -594,6 +591,7 @@ return getInstanceOPMLListFromMaster(gadget, select_limit); }) .push(undefined, function () { + // XXX-catchall: This shall be another branch of promise above to not be catch-all like it's now gadget.state.message .innerHTML = notify_msg_template({ status: 'error', @@ -611,9 +609,6 @@ push_queue .push(function () { return gadget.jio_put(opml_dict.url, opml_dict); - }) - .push(undefined, function (error) { - throw error; }); } @@ -623,6 +618,7 @@ return push_queue; }) .push(undefined, function () { + // XXX-catchall gadget.state.message .innerHTML = notify_msg_template({ status: 'error', diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml index 13c5a620b6d93d6f644e22cb004408b18817b554..3fe77bf46d9e6fa6955bee42fde2dc13d734b8ca 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506444427.15 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506444427.15 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 967.60730.33169.16435 - - - state - current - - - time - - - - - - - - - - - 1530700819.45 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 967.60730.33169.16435 + + + state + current + + + time + + + + + + + + + + + 1530700819.45 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506444397.32 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506444397.32 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_html.xml index 24a6ffdf1d7f59273dd5cb55e6725af12f2dc5ef..f7246d84bbbb07fa20b50fa8e1f62709650ce3a9 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1508939183.78 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1508939183.78 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.539.38470.23978 - - - state - current - - - time - - - - - - - - - - - 1508940730.13 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.539.38470.23978 + + + state + current + + + time + + + + + + + + + + + 1508940730.13 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1508938860.04 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1508938860.04 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_js.xml index 3d969d22fa7eed2454699bcac19595c5ed184eb4..28de7c2bb56489badf0af268c76ba521c80e858e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_jump_js.xml @@ -158,171 +158,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1508939174.14 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1508939174.14 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1510581537.14 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1510581537.14 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1508938943.66 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1508938943.66 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_html.xml index da59feaa53f39df5f1aa778c6529e759ed27d7b0..bbca26c0cb24de647d57d06f236ec335b277f381 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_html.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506071769.76 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506071769.76 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.63817.9300.38417 - - - state - current - - - time - - - - - - - - - - - 1543855483.74 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.63817.9300.38417 + + + state + current + + + time + + + + + + + + + + + 1543855483.74 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506071722.5 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506071722.5 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_js.xml index ddbf3251935d212865eb6717e7ee65d139d7428a..bd46d7d15a56c4883ca4363117c31bae53587765 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_add_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506075175.77 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506075175.77 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.63895.24146.65194 - - - state - current - - - time - - - - - - - - - - - 1543593135.84 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.63895.24146.65194 + + + state + current + + + time + + + + + + + + + + + 1543593135.84 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506072210.95 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506072210.95 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_html.xml index c9ce2e375d1ed1de648bb1fc8bc92b887f909ba1..c71daf2b41a3d12ea75399d41d912c574f10f47e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_html.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507823127.57 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507823127.57 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.643.58620.34440 - - - state - current - - - time - - - - - - - - - - - 1508945525.85 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.643.58620.34440 + + + state + current + + + time + + + + + + + + + + + 1508945525.85 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506439508.28 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506439508.28 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.js index c6045318b00c6c289971498934045030355a91a3..de1ab2fb526303b13f18b84064addcb0b5e50ed0 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.js @@ -12,7 +12,9 @@ .declareAcquiredMethod("jio_remove", "jio_remove") .declareAcquiredMethod("notifySubmitting", "notifySubmitting") .declareAcquiredMethod("notifySubmitted", 'notifySubmitted') - + .declareJob("redirectByJob", function (options) { + return this.redirect(options); + }) .declareMethod("render", function (options) { var gadget = this; @@ -24,7 +26,7 @@ return gadget.notifySubmitted({message: "Document Deleted", status: "success"}); }) .push(function () { - return gadget.redirect({command: 'change', options: { + return gadget.redirectByJob({command: 'change', options: { page: options.return_url || 'settings_configurator' }}); }); diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.xml index 21286736bf44d5b62689f3edcdd03e3cb6839beb..a6b7c7178e805a74c49e1eb6e43313f1766b7296 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_opml_delete_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507823114.3 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507823114.3 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1510581396.39 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1510581396.39 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507823085.55 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507823085.55 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_html.xml index dfa1c1ed8e372f5f6ad2fc4a3f902d1a3fdb63d3..0b1aa6a23d9186ed56c3215aa87246a76b8bd776 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_html.xml @@ -163,171 +163,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1454520196.98 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1454520196.98 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1510669287.69 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1510669287.69 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1454517777.01 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1454517777.01 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.js index 6f9e34d6eb6b0f675bd9c04688e4c603debb1976..a6f6df7c4db50f5c46cdbea67498b2321c3d8ace 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.js @@ -70,6 +70,7 @@ .get(gadget.property_dict.monitor_process_state); }) .push(undefined, function () { + // XXX-catchall return gadget.notifySubmitted({ message: "Error: Failed to download data files!", status: "error" @@ -223,6 +224,7 @@ return gadget.property_dict.jio_gadget .get(gadget.property_dict.monitor_process_state) .push(undefined, function () { + // XXX-catchall return gadget.notifySubmitted({ message: "Error: Failed to download data files!", status: "error" diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.xml index 02316dff88951ba55012322a437975ab575e80c5..e3f8f2d137d3e059422ff5ad32a22679c204cfc2 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_processes_view_js.xml @@ -159,171 +159,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1454520181.06 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1454520181.06 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.29300.23681.7082 - - - state - current - - - time - - - - - - - - - - - 1510669789.68 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.29300.23681.7082 + + + state + current + + + time + + + + + + + + + + + 1510669789.68 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1454518838.17 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1454518838.17 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.xml index 3af8099bb9c8caa0727778c386d0073fe10cc83a..84d9987351589821776700842ac0ae9fb8b75f71 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_html.xml @@ -166,171 +166,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507116490.54 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507116490.54 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.40737.38602.8192 - - - state - current - - - time - - - - - - - - - - - 1542206472.63 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.40737.38602.8192 + + + state + current + + + time + + + + + + + + + + + 1542206472.63 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507111456.51 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507111456.51 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.js index 215bc0e3a57e8232527fcf5f6b76124aff4ee773..ccc98c15632dbc6081d9ab90647710c787ff2637 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.js @@ -24,6 +24,7 @@ var resource_key = gadget.property_dict.resource_dict[key]; return gadget.property_dict.jio_gadget.get(resource_key) .push(undefined, function () { + // XXX-catchall return gadget.notifySubmitted({ message: "Error: Failed to download resource file '" + resource_key + "' from URL: " + gadget.state.opml_outline.url, @@ -74,21 +75,21 @@ //"date, io rw counter, io cycles counter, disk used" line_list = ["io rw count (Kb/s)", "io cycles count (/1000)"]; //, "disk used"]; axis_list.push({ - "0": { - "title": "IO read/write counter", - "scale_type": "linear", - "value_type": "date", - "zoom_range": date_window - } - }); + "0": { + "title": "IO read/write counter", + "scale_type": "linear", + "value_type": "date", + "zoom_range": date_window + } + }); axis_list.push({ - "0": { - "title": "IO cycles counter", - "scale_type": "linear", - "value_type": "date", - "zoom_range": date_window - } - }); + "0": { + "title": "IO cycles counter", + "scale_type": "linear", + "value_type": "date", + "zoom_range": date_window + } + }); for (i = 0; i < line_list.length; i += 1) { line_list[i] = line_list[i].trim(); data_list.push({ @@ -214,7 +215,7 @@ }) .push(function () { //return gadget.element.querySelector('form button[type="submit"]').click(); - return gadget.getDeclaredGadget('form_cpu_graph') + return gadget.getDeclaredGadget('form_cpu_graph') .push(function (form_gadget) { return form_gadget.getContent(); }) @@ -433,14 +434,14 @@ "left", [["my_graph_auto_update"], ["my_cpu_graph_select"]] ], - [ - "right", - [] - ], - [ - "bottom", - [] - ]] + [ + "right", + [] + ], + [ + "bottom", + [] + ]] } }); }) @@ -479,7 +480,7 @@ updateGraph(gadget, true); } if (evt.target.getAttribute("name") === "graph_auto_update_key") { - if (evt.target.value == "on") { + if (evt.target.value === "on") { gadget.property_dict.disable_update = false; } else { gadget.property_dict.disable_update = true; diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.xml index 1506dc8531533dc8e53847f5bb1c37c01d4790c4..55e871512b1649d3a327e59da496b080c119843c 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_resources_view_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507116486.61 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507116486.61 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.43798.57526.26624 - - - state - current - - - time - - - - - - - - - - - 1542387970.17 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.43798.57526.26624 + + + state + current + + + time + + + + + + + + + + + 1542387970.17 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507116464.83 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507116464.83 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_html.xml index 789f33fafbe7d1a69d32288fb78103930ebe2cfd..4bead44ff559312c8902633667e36dcd0f7ca687 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_html.xml @@ -166,171 +166,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507039000.34 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507039000.34 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.34404.44119.35515 - - - state - current - - - time - - - - - - - - - - - 1507901852.14 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.34404.44119.35515 + + + state + current + + + time + + + + + + + + + + + 1507901852.14 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507038898.04 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507038898.04 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.xml index 34131fe44d8f339e6fb9a9abff082ffb583a1085..eb68edde6201c602d97eafa03a3fd8f459821c75 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_software_instance_list_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507039210.34 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507039210.34 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.33401.54396.27033 - - - state - current - - - time - - - - - - - - - - - 1542962938.07 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.33401.54396.27033 + + + state + current + + + time + + + + + + + + + + + 1542962938.07 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507039010.86 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507039010.86 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_html.xml index f0f441ab6daba831e73764af74aa047c377461e5..d2614833548c76cfc806772ef91e006e63db0263 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_html.xml @@ -166,171 +166,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506516313.96 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506516313.96 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.53042.7222.55944 - - - state - current - - - time - - - - - - - - - - - 1508235749.35 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.53042.7222.55944 + + + state + current + + + time + + + + + + + + + + + 1508235749.35 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506516149.14 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506516149.14 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_js.xml index d5cb6dacd9e0bc3b84b647fbe15ff27b538079d7..54de1295551a40562fc6c43e2cb4c34d5e230452 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_status_list_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506516418.22 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506516418.22 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.52364.9776.56234 - - - state - current - - - time - - - - - - - - - - - 1542962994.23 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.52364.9776.56234 + + + state + current + + + time + + + + + + + + + + + 1542962994.23 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506516385.15 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506516385.15 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_html.xml index 8e8ae6309c95133ef7db27c6343c81fc9ac27ae7..f4ff3b12e9465499adcfae95c233bd7d03ee0b2b 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1508158905.14 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1508158905.14 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.53016.6432.29064 - - - state - current - - - time - - - - - - - - - - - 1508155694.63 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.53016.6432.29064 + + + state + current + + + time + + + + + + + + + + + 1508155694.63 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1508145466.78 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1508145466.78 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js index 8c9dbf6980ed449caa597ce991f9d0871d38ad4d..e5c9db1b8d1e7f41f1df2a7a89fe96dead8ec729 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.js @@ -11,7 +11,9 @@ .declareAcquiredMethod("redirect", "redirect") .declareAcquiredMethod("getSetting", "getSetting") .declareAcquiredMethod("setSetting", "setSetting") - + .declareJob("redirectByJob", function (options) { + return this.redirect(options); + }) .declareMethod("render", function (options) { var gadget = this; return this.updateHeader({ @@ -30,7 +32,7 @@ // reset redirections return gadget.setSetting("sync_redirect_options", undefined) .push(function () { - return gadget.redirect({ + return gadget.redirectByJob({ "command": "display", "options": redirect_options }); @@ -44,7 +46,7 @@ } }) .push(function () { - return gadget.redirect({ + return gadget.redirectByJob({ "command": "display", "options": redirect_options }); diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml index 1e2f695ee1d8e4803ac321d21848da0094ba0aed..35abc90e6c2ce32276420b555f46d0a1bb95309c 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_synchronize_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1508158885.64 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1508158885.64 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.18960.44200.52138 - - - state - current - - - time - - - - - - - - - - - 1540897197.53 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.18960.44200.52138 + + + state + current + + + time + + + + + + + + + + + 1540897197.53 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1508155724.51 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1508155724.51 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_html.xml index 947289dff7b3f0c3df3eede00a7ee0c12ceb3f72..16a870b57bb60f036e051b398a9dfbba399c305e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509441539.56 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509441539.56 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.40832.39714.27067 - - - state - current - - - time - - - - - - - - - - - 1542210787.16 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.40832.39714.27067 + + + state + current + + + time + + + + + + + + + + + 1542210787.16 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509441105.7 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509441105.7 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.js index 5407601fbbaaf6b8bb08f34a3da33878b8c2ad81..b732070e2ab8786194f032202b347a573c273cd7 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.js @@ -22,16 +22,10 @@ .declareAcquiredMethod("notifySubmitted", 'notifySubmitted') .allowPublicAcquisition("jio_allDocs", function (param_list) { - var gadget = this, - destroy_element = gadget.element.querySelector("#destroyOPML"); + var gadget = this; return gadget.jio_allDocs(param_list[0]) .push(function (result) { var i, value, len = result.data.total_rows; - if (result.data.total_rows === 0) { - destroy_element.setAttribute("disabled", "disabled"); - } else if (destroy_element.getAttribute("disabled") === "disabled") { - destroy_element.setAttribute("disabled", ""); - } for (i = 0; i < len; i += 1) { if (result.data.rows[i].value.hasOwnProperty("active")) { result.data.rows[i].value.active = { @@ -107,7 +101,7 @@ return gadget.getSetting('latest_sync_time'); }) .push(function (finish_time) { - if (finish_time - sync_start_time < 0) { +/* if (finish_time - sync_start_time < 0) { // sync is running, cannot remove OPML now success = false; return RSVP.all([ @@ -117,7 +111,7 @@ status: 'error' }) ]); - } + }*/ element.setAttribute("disabled", "disabled"); return gadget.jio_allDocs({ query: 'portal_type: "opml"', @@ -149,6 +143,7 @@ ); element.setAttribute('rel', ''); if (success) { + element.removeAttribute("disabled"); return gadget.redirect({"command": "reload"}); } }); @@ -159,7 +154,7 @@ doc; return gadget.notifySubmitting() .push(function () { - return gadget.getDeclaredGadget('form_view'); + return gadget.getDeclaredGadget('form_view'); }) .push(function (form_gadget) { return form_gadget.getContent(); @@ -187,7 +182,7 @@ }) .push(function () { return RSVP.all([ - gadget.notifySubmitted({message: 'Parameters Updated', status: 'success'}) + gadget.notifySubmitted({message: 'Data updated.', status: 'success'}) ]); }); }) @@ -195,6 +190,9 @@ .declareMethod("triggerSubmit", function (event) { return this.element.querySelector('form button[type="submit"]').click(); }) + .declareJob("redirectByJob", function (options) { + return this.redirect(options); + }) .declareMethod("render", function (options) { var gadget = this, last_sync_time, @@ -207,7 +205,7 @@ if (options.url) { // backward compatibility redirect to add opml options.page = "ojsm_opml_add"; - return gadget.redirect({"command": "change", "options": options}); + return gadget.redirectByJob({"command": "change", "options": options}); } return new RSVP.Queue() diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.xml index da13b266c8a9779089c637516d939a4408bbd1d6..bdef2a8b7e95bc6aa0c674170fa55822e9d083ad 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_settings_configurator_js.xml @@ -158,171 +158,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509441101.54 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509441101.54 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.42397.40766.62515 - - - state - current - - - time - - - - - - - - - - - 1542303383.28 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.42397.40766.62515 + + + state + current + + + time + + + + + + + + + + + 1542303383.28 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509440963.17 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509440963.17 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_html.xml index 060aec1a45c7ee62a131e8510d1b48fa8ab3a89a..d3efacdfb501d27cc0dc7c9e723152ca16a09096 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_html.xml @@ -166,171 +166,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1464275301.8 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1464275301.8 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.13402.51340.4454 - - - state - current - - - time - - - - - - - - - - - 1540563538.46 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.13402.51340.4454 + + + state + current + + + time + + + + + + + + + + + 1540563538.46 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1464275180.09 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1464275180.09 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.js index f997f8e541925aac691aa4f7c05a808e8a3c36ef..5f51481c222be1cbcd73454b6f4831d92eefb232 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.js @@ -160,7 +160,7 @@ ]); } return RSVP.all([ - gadget.notifySubmitted({message: 'Parameters Updated', status: 'success'}) + gadget.notifySubmitted({message: 'Data updated.', status: 'success'}) ]); }); }) @@ -194,17 +194,17 @@ .value.aggregate_reference === undefined) { // Instance is not Synchronized! promise_list.push(false); - continue; + } else { + gadget_element = document.createElement("div"); + element.appendChild(gadget_element); + promise_list.push( + gadget.declareGadget("gadget_officejs_monitoring_parameter_view.html", + {element: gadget_element, + scope: 'p_' + gadget.state.instance_dict.data.rows[i].id, + sandbox: "public"} + ) + ); } - gadget_element = document.createElement("div"); - element.appendChild(gadget_element); - promise_list.push( - gadget.declareGadget("gadget_officejs_monitoring_parameter_view.html", - {element: gadget_element, - scope: 'p_' + gadget.state.instance_dict.data.rows[i].id, - sandbox: "public"} - ) - ); } return RSVP.all(promise_list); }) diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.xml index c07ed56bc1d063fe7091bbe1a859f2ca2d7a2bd7..dccc496c61a329debe98f06d126eda352230d194 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_hosting_subscription_view_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1464275223.91 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1464275223.91 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 972.4007.38246.25361 - - - state - current - - - time - - - - - - - - - - - 1543845609.21 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 972.4007.38246.25361 + + + state + current + + + time + + + + + + + + + + + 1543845609.21 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1464275183.55 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1464275183.55 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_html.xml index adfb424e2e73f1b157e5edc4a49bd9320d110a77..ff426199f59f700f3f3f64276065ff9097135de1 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_html.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506358065.91 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506358065.91 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.29465.32349.33501 - - - state - current - - - time - - - - - - - - - - - 1510675412.13 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.29465.32349.33501 + + + state + current + + + time + + + + + + + + + + + 1510675412.13 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506358032.88 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506358032.88 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.js index a48a1ec3166edd244997497c001d5404a0315c03..603ba916601f25f44320113467e9d52007d0b4ee 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.js @@ -1,4 +1,4 @@ -/*global window, rJS, RSVP, Handlebars */ +/*global window, rJS, RSVP, Rusha, Handlebars */ /*jslint nomen: true, indent: 2, maxerr: 3 */ (function (window, rJS, RSVP, Rusha) { "use strict"; @@ -58,7 +58,7 @@ return opml_gadget.saveOPML(doc, verify_opml); }) .push(function (state) { - var msg = {message: 'Document Updated', status: 'success'}; + var msg = {message: 'Data updated.', status: 'success'}; if (!state.status) { msg = {message: 'Document update failed', status: "error"}; } diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.xml index bcc8d95f7300bbacd6f07590afdc84b43b08297f..869fa1c9042935d56b3339f2e555398ae25caf5e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_opml_view_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507911358.15 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507911358.15 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.63925.15236.1962 - - - state - current - - - time - - - - - - - - - - - 1543595657.95 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.63925.15236.1962 + + + state + current + + + time + + + + + + + + + + + 1543595657.95 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506357952.51 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506357952.51 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_html.xml index 5020775ba13393a8577657340b2ebd64405d398c..d8bfcaa55a8c45145ed4a4a0fe10c309be674cf3 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_html.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506672679.59 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506672679.59 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.48890.59022.44748 - - - state - current - - - time - - - - - - - - - - - 1508252274.8 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.48890.59022.44748 + + + state + current + + + time + + + + + + + + + + + 1508252274.8 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506672050.57 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506672050.57 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.js index 8a90bcb10769f11fc3e64bdbe1c7296cd165bcc4..a6628cf5dc12c5739b15eb0edae90b9575414eee 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.js @@ -210,9 +210,10 @@ gadget.state.promise.source + ".history" ) .push(undefined, function (error) { - if (error.name === "cancel") { + if (error.name === "cancel") { // XXX-catchall: better error instanceof RSVP.CancellationError return undefined; } + // XXX-catchall return gadget.notifySubmitted({ status: "error", message: "Failed to get promise history content! \n" + @@ -228,7 +229,7 @@ start; function addUTCTimezone(date_string) { - if (new RegExp(/[+-][\d]{2}\:?[\d]{2}$/).test(date_string)) { + if (new RegExp(/[+\-][\d]{2}\:?[\d]{2}$/).test(date_string)) { return date_string; } return date_string + "+0000"; diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.xml index f201034603c24dda09ff532d8caf9ac3b2615dbb..5c43d538808c4e886027ca7d706fa750591f8ad3 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_promise_view_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506672671.19 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506672671.19 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.63542.55851.49134 - - - state - current - - - time - - - - - - - - - - - 1543572898.71 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.63542.55851.49134 + + + state + current + + + time + + + + + + + + + + + 1543572898.71 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506672641.63 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506672641.63 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.xml index a1880d2bb080dbe4034ed04a5b6958115d664624..580233263facb12158ed18888dc79accc125e538 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_html.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507041798.03 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507041798.03 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.33703.45054.40584 - - - state - current - - - time - - - - - - - - - - - 1514370578.19 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.33703.45054.40584 + + + state + current + + + time + + + + + + + + + + + 1514370578.19 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507041764.07 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507041764.07 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.xml index dfaabc9b036d77ae51f503664619c6b40e892e3c..5d5295d49b6a7d97e8b6b5ea0d981533608e2a67 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_jio_software_instance_view_js.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507042651.46 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507042651.46 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 972.4061.47106.61696 - - - state - current - - - time - - - - - - - - - - - 1543848850.64 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 972.4061.47106.61696 + + + state + current + + + time + + + + + + + + + + + 1543848850.64 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1507042622.22 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1507042622.22 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml index 635085fa2bc062bb9cbc1530c582b315767a9941..e9c184ee1921d0577eec7554f6829479462c962f 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml @@ -309,114 +309,122 @@ NETWORK:\n - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509980323.24 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509980323.24 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 972.4099.58600.53947 - - - state - current - - - time - - - - - - - - - - - 1543855489.22 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 972.4099.58600.53947 + + + state + current + + + time + + + + + + + + + + + 1543855489.22 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_custom_css.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_custom_css.xml index 84f5df3094586913c642299560eba626c5f453f6..cbb0fb99050b0c2bbca541152acdd66e2a845356 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_custom_css.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_custom_css.xml @@ -159,173 +159,185 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1451915043.24 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1451915043.24 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.43784.34275.28586 - - - state - current - - - time - - - - - - - - - - - 1542388521.4 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.43784.34275.28586 + + + state + current + + + time + + + + + + + + + + + 1542388521.4 + UTC + + + + + + + + + + - + - - - - - - action - - - - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - empty - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1451914920.23 - UTC - - - - - - - - + + + _log + + + + + action + + + + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + empty + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1451914920.23 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_html.xml index e7bd22a1363cdfd802f783d783b5d16c608a10bc..fe3ce7f5209ead8cf5e95679b73658c560cb64b0 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506091264.63 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506091264.63 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.17168.33730.14216 - - - state - current - - - time - - - - - - - - - - - 1506091257.12 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.17168.33730.14216 + + + state + current + + + time + + + + + + + + + + + 1506091257.12 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506091214.66 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506091214.66 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_js.xml index f7d0eecf12cb023220a7c485b904a0cd67255d16..fe972d12789041bba013dd51085a78e45685b449 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_header_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506091331.03 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506091331.03 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1542277962.83 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1542277962.83 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506091309.21 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506091309.21 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_html.xml index 310da99d6c465cd33ad08533542cb1a169ce254e..1d362108dae8a8aabc991ab6740aaaca9d7d3618 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_html.xml @@ -157,171 +157,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1452875306.6 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1452875306.6 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.22427.36654.49664 - - - state - current - - - time - - - - - - - - - - - 1510320135.91 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.22427.36654.49664 + + + state + current + + + time + + + + + + + + + + + 1510320135.91 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1452874965.12 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1452874965.12 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js index f8f51db0c626c9cecf63ee93e7e204ef0497b036..7eb5473501403f21ea54e70102ba5956d24e4c45 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js @@ -63,10 +63,7 @@ }) .declareMethod('repair', function () { var storage = this.props.jio_storage; - return storage.repair.apply(storage, arguments) - .push(undefined, function (error) { - throw error; - }); + return storage.repair.apply(storage, arguments); }); }(window, rJS, jIO)); \ No newline at end of file diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml index cb95f6250fc8f642085e2d192bc6deb56645ac8d..4fde11af26a8752885c83457bc6f047305fdefa0 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml @@ -159,171 +159,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1452874954.73 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1452874954.73 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 964.14420.61705.7611 - - - state - current - - - time - - - - - - - - - - - 1513617981.41 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 964.14420.61705.7611 + + + state + current + + + time + + + + + + + + + + + 1513617981.41 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1452874888.03 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1452874888.03 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_html.xml index 787db611b4b65b1041cd1986f5a76469b8f9a176..55a432df1b0205221d4159c979e5c20657f2008e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_html.xml @@ -170,171 +170,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1510673457.39 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1510673457.39 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.29438.65222.13568 - - - state - current - - - time - - - - - - - - - - - 1510673297.93 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.29438.65222.13568 + + + state + current + + + time + + + + + + + + + + + 1510673297.93 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1510673090.03 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1510673090.03 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.js index 7bd0fdd3fbc690d1e9960e386ff36220536c7d4d..c93217bd17b11e8fcf82886bac10fdab9ab0d4f5 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.js @@ -177,14 +177,16 @@ }); }) .push(undefined, function (error) { + // XXX-catchall var message_text, - code = 0; + code = 0; if (error instanceof jIO.util.jIOError) { message_text = error.message; code = error.status_code; } else if (error instanceof TypeError || error.message) { message_text = error.message; } else { + // XXX-catchall could be solved by putting here only throw error; code = error.target.status; message_text = error.target.responseType === "text" ? error.target.statusText : ""; diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.xml index 0db1c02cf9c26a37f76a94c7a0f788fb9a2f03dc..7c66b50d5b37249033871fa484b0fb784252a764 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_opml_edit_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509018342.18 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509018342.18 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.63860.22689.21760 - - - state - current - - - time - - - - - - - - - - - 1543593317.26 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.63860.22689.21760 + + + state + current + + + time + + + + + + + + + + + 1543593317.26 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509016096.05 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509016096.05 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_html.xml index 9dcfefd1abfc3df82e230ce625349c93121a3df4..54d231896ab217834b8034c8152dd54d43192788 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_html.xml @@ -196,171 +196,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506002303.54 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506002303.54 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.16563.15280.46899 - - - state - current - - - time - - - - - - - - - - - 1509979830.19 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.16563.15280.46899 + + + state + current + + + time + + + + + + + + + + + 1509979830.19 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506002246.15 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506002246.15 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.js index f600de60bc2562d3bbb1021d5d95738671d72806..6bde20eec2d6ecffdce9c408811eaa2349091cca 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.js @@ -71,7 +71,7 @@ } return context.getUrlParameter('editable') .push(function () { - return context.registerSync(); + return context.registerSynchronisation(); }) .push(function (editable) { return context.changeState({ @@ -273,7 +273,7 @@ window.dispatchEvent(event); return result; }) - .declareJob('registerSync', function () { + .declareJob('registerSynchronisation', function () { return this.getDeclaredGadget("sync_gadget") .push(function (sync_gadget) { return sync_gadget.register(); diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.xml index 2033311bd185ac6e9a6c458318d70d94f9688eb7..c16a63d61e418e0fec6ac0fa36ec5404c1ce353e 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_panel_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506003162.94 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506003162.94 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.37975.58604.24371 - - - state - current - - - time - - - - - - - - - - - 1542039239.11 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.37975.58604.24371 + + + state + current + + + time + + + + + + + + + + + 1542039239.11 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506003139.6 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506003139.6 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_html.xml index b10275dee84610a52a2cae71b02dc9851938b5a8..a131a095e9154d4c3e375c1c546803b68b0472fc 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_html.xml @@ -157,171 +157,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1457541237.88 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1457541237.88 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.48796.46496.25958 - - - state - current - - - time - - - - - - - - - - - 1507902529.61 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.48796.46496.25958 + + + state + current + + + time + + + + + + + + + + + 1507902529.61 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1457539323.65 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1457539323.65 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_js.xml index 59b06a8d50a125970c3f6493d8dec6a6132d657d..652feaaf18fe5e28c42b3f763f5cbef5392bc819 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_parameter_view_js.xml @@ -159,171 +159,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1457541225.98 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1457541225.98 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27984.14453.52343 - - - state - current - - - time - - - - - - - - - - - 1510664009.77 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27984.14453.52343 + + + state + current + + + time + + + + + + + + + + + 1510664009.77 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1457541085.23 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1457541085.23 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_router_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_router_html.xml index 006717f3482fbfc53c41460b6949b1ce15380692..a9b0f86738b247d03e7be9a80bec74cf1074cceb 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_router_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_router_html.xml @@ -196,171 +196,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1506001096.2 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1506001096.2 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 962.47406.45080.56866 - - - state - current - - - time - - - - - - - - - - - 1507819282.45 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 962.47406.45080.56866 + + + state + current + + + time + + + + + + + + + + + 1507819282.45 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1506000938.79 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1506000938.79 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_html.xml index b73aa796f616854b2b3a5300a022e132b752978e..ff8fb6de826f73ad8053083542c7b470bc761275 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_html.xml @@ -166,171 +166,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1463424662.99 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1463424662.99 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.20929.61143.52155 - - - state - current - - - time - - - - - - - - - - - 1510233336.64 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.20929.61143.52155 + + + state + current + + + time + + + + + + + + + + + 1510233336.64 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1463424597.78 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1463424597.78 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.js index b9ed53c0a9b8111381d1502c06b4b5460089eb1f..274a87e4c6aa52194b0bef99b84cce20fdfcf4b0 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.js @@ -67,6 +67,7 @@ return gadget.jio_repair(); }) .push(undefined, function (error) { + // XXX-catchall // should include error message in error has_error = true; console.error(error); @@ -121,6 +122,7 @@ return testOnline(parser.origin); }) .push(undefined, function () { + // XXX-catchall return {status: "ERROR"}; }) .push(function (online_result) { diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.xml index ce0560eae9e6f4648459accc0624376a344a7586..4f198f363985b82b32ad6ad65f3cfed14618fc36 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_sync_js.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1463424020.0 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1463424020.0 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 964.38426.36779.39065 - - - state - current - - - time - - - - - - - - - - - 1515058880.82 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 964.38426.36779.39065 + + + state + current + + + time + + + + + + + + + + + 1515058880.82 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1463423808.77 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1463423808.77 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.xml index 7f673f1aadeefcf7228b134607ad63cdb6f958bc..0aee4c3b9f4c05df963ac488e846eda3dd9f089b 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1514308505.48 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1514308505.48 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 964.25931.6156.58743 - - - state - current - - - time - - - - - - - - - - - 1514370606.61 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 964.25931.6156.58743 + + + state + current + + + time + + + + + + + + + + + 1514370606.61 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1514307956.78 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1514307956.78 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.js index 512bc93b5f902ba144f79c0615ad6a06699e7998..b8759f554fbd9d8a372ce76e2d11c41282657670 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.js @@ -49,6 +49,7 @@ ); }) .push(undefined, function (error) { + // XXX-catchall gadget.state.data_dict.data = {}; return gadget.notifySubmitted({ message: "Warning: Failed to download graph data file '" + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.xml index ea01fab25bb5eca627c6ebceeadf63118ef861e9..e4400baabdedd7a1554c680dc1cfc9d61b31c7fe 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_ojsm_graph_field_js.xml @@ -158,171 +158,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1514308148.29 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1514308148.29 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 964.26990.55688.60364 - - - state - current - - - time - - - - - - - - - - - 1514372119.82 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 964.26990.55688.60364 + + + state + current + + + time + + + + + + + + + + + 1514372119.82 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1514308114.16 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1514308114.16 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/jsen_json_validator_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/jsen_json_validator_js.xml index d3bc3dfbcf0e1a5231829e4c25aaed5f2ad3293c..2831a21d6b5020992c42b8b47fabad14cbb6bf7a 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/jsen_json_validator_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/jsen_json_validator_js.xml @@ -155,171 +155,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1459353532.23 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1459353532.23 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 950.11678.57082.49612 - - - state - current - - - time - - - - - - - - - - - 1459353676.82 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 950.11678.57082.49612 + + + state + current + + + time + + + + + + + + + + + 1459353676.82 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1459353475.59 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1459353475.59 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js index 1a88df3ee984131818efff634267f580de6f9a55..9f5284cdf3d8a4ec471afee4095f3a0da208f4ef 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js @@ -4,7 +4,7 @@ * http://www.gnu.org/licenses/lgpl.html */ -/*jslint nomen: true */ +/*jslint nomen: true, indent: 2, maxerr: 3*/ /*global jIO, RSVP, Rusha, console, Blob */ (function (jIO, RSVP, Rusha, Blob, console) { @@ -212,6 +212,7 @@ return storage.removeAttachment(id, name); }) .push(undefined, function (error) { + // XXX-catchall: This shall be another branch of promise above to not be catch-all like it's now if ((error instanceof jIO.util.jIOError) && (error.status_code === 404)) { return undefined; @@ -272,7 +273,7 @@ (error.status_code === 404)) { return undefined; } - console.error(error); + console.error(error); // XXX-catchall: this shall be throw error }) .push(function (attachment) { if (attachment) { @@ -366,6 +367,7 @@ }; return sub_storage.allDocs({include_docs: true}) .push(undefined, function (error) { + // XXX-catchall //throw error; console.error(error); return undefined; @@ -402,6 +404,15 @@ }); } + function fixDateTimezone(date_string) { + // set default timezone offset to UTC + // XXX should be removed later + if (ZONE_LIST.indexOf(date_string.slice(-5)) === -1) { + return date_string + "+0000"; + } + return date_string; + } + function updateHostingSubscriptionState(hosting, element) { var status = element.status.toUpperCase(); @@ -410,22 +421,15 @@ } if (hosting.status === "ERROR") { return; - } else if (status === "ERROR") { + } + if (status === "ERROR") { hosting.status = status; } else if (status === "WARNING") { hosting.status = status; - } if (status === "OK" && hosting.status !== status) { - hosting.status = status; } - } - - function fixDateTimezone(date_string) { - // set default timezone offset to UTC - // XXX should be removed later - if (ZONE_LIST.indexOf(date_string.slice(-5)) === -1) { - return date_string + "+0000"; + if (status === "OK" && hosting.status !== status) { + hosting.status = status; } - return date_string; } function getOpmlTree(context, opml_url, opml_spec, basic_login, opml_title) { @@ -467,7 +471,7 @@ return {data: {total_rows: 0}}; } //throw error; - console.error(error); + console.error(error); // XXX-catchall throw error return {data: {total_rows: 0}}; }) .push(function (opml_result) { @@ -702,8 +706,7 @@ name: result_list[i].url, doc: result_list[i].current_signature }); - } - else if (context._remote_storage_unreachable_status !== undefined) { + } else if (context._remote_storage_unreachable_status !== undefined) { if (result_list[i].type === "webhttp") { // In case it was impossible to get software Instance // Add an empty Software Instance with unreachable status @@ -791,7 +794,7 @@ ); }) .push(undefined, function (error) { - console.error(error); + console.error(error); // XXX-catchall: throw error }); } for (j = 0; j < attachment_document_list.length; j += 1) { diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml index 9fd4ae6b236ffa51758d6840df255042d09850dc..f0b4c47ec994677e95c4722b3113846b96c711c9 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml @@ -159,171 +159,183 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1456160046.44 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1456160046.44 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 972.3978.30023.34679 - - - state - current - - - time - - - - - - - - - - - 1543851108.12 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 972.3978.30023.34679 + + + state + current + + + time + + + + + + + + + + + 1543851108.12 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1456157682.63 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1456157682.63 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.js index 4de782302aff571d67ab8e8b0b23fa45a12bf5d3..14818c9f9817222d34da03ccf1881e5f8ae9dbf6 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.js @@ -4,7 +4,7 @@ * http://www.gnu.org/licenses/lgpl.html */ -/*jslint nomen: true*/ +/*jslint nomen: true, indent: 2, maxerr: 3*/ /*global jIO, RSVP */ (function (jIO, RSVP) { diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.xml index ebeebfa33a35de65c7fe9ae33e357cc2e31b09b6..21604d1f1d1c627f1edb0dd509006b14ee9644d8 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_web_storage_js.xml @@ -162,173 +162,185 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1502432791.29 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1502432791.29 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1513173954.77 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1513173954.77 + UTC + + + + + + + + + + - + - - - - - - action - - - - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - empty - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1502432716.21 - UTC - - - - - - - - + + + _log + + + + + action + + + + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + empty + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1502432716.21 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml index 3cad3a1608ad6dba17452047be16190e32db1703..2d6ce4bd0534d6d42e8521408de55b9a9b5b1dc2 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_html.xml @@ -162,171 +162,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509383932.65 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509383932.65 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 964.25935.32773.12561 - - - state - current - - - time - - - - - - - - - - - 1514308778.96 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 964.25935.32773.12561 + + + state + current + + + time + + + + + + + + + + + 1514308778.96 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509381854.52 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509381854.52 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.js b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.js index aa4385d564962fab9243ae94e7893c57af13fc01..c51a5f5b7b9eaa086e98c8bddf763de89bc4ff10 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.js +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.js @@ -1,5 +1,5 @@ /*global window, rJS, Handlebars */ -/*jslint indent: 2, maxerr: 3 */ +/*jslint nomen: true, indent: 2, maxerr: 3 */ (function (window, rJS, Handlebars) { "use strict"; @@ -7,7 +7,7 @@ templater = gadget_klass.__template_element, status_field_template = Handlebars.compile( templater.getElementById("template-status-field").innerHTML - ); + ); gadget_klass .declareMethod('render', function (options) { @@ -22,7 +22,7 @@ return this.changeState(state_dict); }) - .onStateChange(function (modification_dict) { + .onStateChange(function () { if (this.state.hidded) { this.element.innerHTML = ""; } else { diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.xml index 6df16a19d8b1872d146c6ee53595bc32e8e23c33..b1861a4e3b3aa079abdeb14b0af9f59c49bf485c 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/ojsm_gadget_erp5_statusfield_js.xml @@ -158,171 +158,183 @@ - + - - - - - - action - publish_alive - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1509383886.65 - UTC - - - - - - - validation_state - published_alive - - - - + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1509383886.65 + UTC + + + + + + + validation_state + published_alive + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.7950.43708.60125 - - - state - current - - - time - - - - - - - - - - - 1509446414.84 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.7950.43708.60125 + + + state + current + + + time + + + + + + + + + + + 1509446414.84 + UTC + + + + + + + + + + - + - - - - - - action - detect_converted_file - - - actor - zope - - - comment - - - - error_message - - - - external_processing_state - converted - - - serial - 0.0.0.0 - - - time - - - - - - - - - - - 1509383862.21 - UTC - - - - - - - - + + + _log + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1509383862.21 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring.xml index eb5412909a123df2c0f310080b969b29c0056374..0f34704e2167021dfb85b04d843977296d2c3476 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring.xml @@ -432,114 +432,122 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507825401.94 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507825401.94 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 971.23483.52641.49749 - - - state - current - - - time - - - - - - - - - - - 1541168426.77 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 971.23483.52641.49749 + + + state + current + + + time + + + + + + + + + + + 1541168426.77 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml b/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml index 81eee4985a09c6c30884fdae2c5ac02616c10ab4..4a4c7d5ce89962b28b34ad3f6236e225309aa210 100644 --- a/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml +++ b/bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml @@ -482,114 +482,122 @@ - + - - - - - - action - publish - - - actor - zope - - - comment - - - - error_message - - - - time - - - - - - - - - - - 1507825544.87 - UTC - - - - - - - validation_state - published - - - - + + + _log + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1507825544.87 + UTC + + + + + + + validation_state + published + + + + + + - + - - - - - - action - edit - - - actor - zope - - - comment - - - - - - error_message - - - - serial - 963.27666.8050.30907 - - - state - current - - - time - - - - - - - - - - - 1541168426.77 - UTC - - - - - - - - + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 963.27666.8050.30907 + + + state + current + + + time + + + + + + + + + + + 1541168426.77 + UTC + + + + + + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite.xml b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite.xml index 17f636aeba2f8ace1a431d4c23dc9ac70744e26d..ea055a6880bce51fcfd7c2f2fe32fbac4a20803d 100644 --- a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite.xml +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite.xml @@ -6,6 +6,72 @@ + + __before_publishing_traverse__ + + + + + + + + + + _defined_in_class + 0 + + + _hookname + __before_publishing_traverse__ + + + _list + + + + + + + + + + + name + MonitorBackend_accessRule + + + + + + + + + _prior + + + + + + + + + + + __before_traverse__ + + + + + + 1 + AccessRule + + + + + + + _objects diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_accessRule.py b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_accessRule.py new file mode 100644 index 0000000000000000000000000000000000000000..b63aa8157db9fb07b82f94391a9250a87a772d36 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_accessRule.py @@ -0,0 +1,11 @@ +setHeader = context.REQUEST.response.setHeader +setHeader("Access-Control-Allow-Origin", "*") +setHeader("Access-Control-Allow-Methods", "HEAD, OPTIONS, GET, POST") +setHeader("Access-Control-Allow-Headers", "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization") +PATH = context.REQUEST['PATH_INFO'] +if '/simulator' in PATH: + real, simulator = PATH.split('simulator') + container.REQUEST.set('PATH_INFO', real) + container.REQUEST.set('SIMULATOR_PATH', simulator) + container.REQUEST.set('SCRIPT_NAME', 'MonitorBackend_simulator') + container.REQUEST.set('TraversalRequestNameStack', ['MonitorBackend_simulator']) diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_accessRule.xml b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_accessRule.xml new file mode 100644 index 0000000000000000000000000000000000000000..a9480a5ef2c149153dd65816175d56800848ab19 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_accessRule.xml @@ -0,0 +1,66 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + icon + misc_/SiteAccess/AccessRule.gif + + + id + MonitorBackend_accessRule + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_getBaseUrl.py b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_getBaseUrl.py new file mode 100644 index 0000000000000000000000000000000000000000..176bd020c532e9ec7f75dca0119e4a27cdeca4ab --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_getBaseUrl.py @@ -0,0 +1 @@ +return context.absolute_url() + '/simulator/' diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.xml b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_getBaseUrl.xml similarity index 93% rename from bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.xml rename to bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_getBaseUrl.xml index 66d0f3d155f37169f14ce13d62b0af577a392927..9948500af0d4e861648832955c4066143208aa16 100644 --- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.xml +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_getBaseUrl.xml @@ -50,11 +50,11 @@ _params - REQUEST=None, response=None, mapping_dict=None + id - WebPage_viewAsWeb + MonitorBackend_getBaseUrl diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulator.py b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulator.py new file mode 100644 index 0000000000000000000000000000000000000000..13baf89936204e5daac7b391ddc09c8b83f185c8 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulator.py @@ -0,0 +1,6 @@ +path = container.REQUEST['SIMULATOR_PATH'] +value = container.MonitorBackend_simulatorMapping(path) +if value is not None: + return value +else: + return 'OK' diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulator.xml b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulator.xml new file mode 100644 index 0000000000000000000000000000000000000000..c98c5a757b7a88d3cb16247d34d57d10cb1431fa --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulator.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + id + MonitorBackend_simulator + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulatorMapping.py b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulatorMapping.py new file mode 100644 index 0000000000000000000000000000000000000000..4f583529215e3bf86ff7ed9b31c11856008c3af7 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulatorMapping.py @@ -0,0 +1,241 @@ +base = context.portal_tests.web_monitoring_ui_zuite.MonitorBackend_getBaseUrl() +# normalize +path = path.strip('/') +# normalize share +path = path.replace('share/', '') +value = { + 'rootInstance/public/feeds': """ + + + + TEST Hosting Subscription + Fri, 17 Jan 2020 12:16:59 +0000 + Fri, 17 Jan 2020 12:16:59 +0000 + + + + + + + +""", + 'rootInstance/public/feed': """ + + + rootInstance + %(base)s/rootInstance/public/feed + TEST Hosting Subscription + Fri, 17 Jan 2020 12:16:59 +0000 + %(base)s/gc//blogs.law.harvard.edu/tech/rss + + test_promise_3 + %(base)s/rootInstance/share/private/ + description of test_promise_3 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_3 + + + test_promise_0 + %(base)s/rootInstance/share/private/ + description of test_promise_0 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_0 + + + test_promise_2 + %(base)s/rootInstance/share/private/ + description of test_promise_2 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_2 + + + test_promise_1 + %(base)s/rootInstance/share/private/ + description of test_promise_1 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_1 + + + test_promise_4 + %(base)s/rootInstance/share/private/ + description of test_promise_4 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_4 + + +""", + 'rootInstance/public/test_promise_0.json': """{"status": "OK", "change-time": 1579263419.246462, "instance": "rootInstance", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_0", "_links": {"monitor": {"href": "%(base)s/rootInstance/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'rootInstance/public/test_promise_1.json': """{"status": "OK", "change-time": 1579263419.246462, "instance": "rootInstance", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_1", "_links": {"monitor": {"href": "%(base)s/rootInstance/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'rootInstance/public/test_promise_2.json': """{"status": "OK", "change-time": 1579263419.246462, "instance": "rootInstance", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_2", "_links": {"monitor": {"href": "%(base)s/rootInstance/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'rootInstance/public/test_promise_3.json': """{"status": "OK", "change-time": 1579263419.246462, "instance": "rootInstance", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_3", "_links": {"monitor": {"href": "%(base)s/rootInstance/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'rootInstance/public/test_promise_4.json': """{"status": "OK", "change-time": 1579263419.246462, "instance": "rootInstance", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_4", "_links": {"monitor": {"href": "%(base)s/rootInstance/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'rootInstance/private/_document_list': """monitor.global""", + 'rootInstance/private/monitor.global.json': """{"status": "OK", "_links": {"rss_url": {"href": "%(base)s/rootInstance/public/feed"}, "public_url": {"href": "%(base)s/rootInstance/share/public/"}, "private_url": {"href": "%(base)s/rootInstance/share/private/"}}, "state": {"warning": 0, "success": 3, "error": 0}, "_embedded": {"instance": {"partition": "slappart1", "ipv6": "2001:67c:1254:e:c4::c748", "computer": "slaprunner", "ipv4": "10.0.165.37", "software-release": "http://xxx.yyy.zz/asoftware/software.cfg", "software-type": "pull-backup"}}, "parameters": [{"key": "", "value": "some parameter", "title": "demo"}], "title": "rootInstance", "date": "2020-01-17 13:16:59", "type": "global", "hosting-title": "TEST Hosting Subscription", "data": {"process_state": "monitor_process_resource.status", "io_resource": "monitor_resource_io.data", "state": "monitor_state.data", "memory_resource": "monitor_resource_memory.data", "process_resource": "monitor_resource_process.data", "monitor_process_state": "monitor_resource.status"}}""", + 'subInstance-1/public/feed': """ + + + subInstance-1 + %(base)s/subInstance-1/public/feed + TEST Hosting Subscription + Fri, 17 Jan 2020 12:16:59 +0000 + %(base)s/gc//blogs.law.harvard.edu/tech/rss + + test_promise_3 + >%(base)s/subInstance-1/share/private/ + description of test_promise_3 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_3 + + + test_promise_0 + >%(base)s/subInstance-1/share/private/ + description of test_promise_0 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_0 + + + test_promise_2 + >%(base)s/subInstance-1/share/private/ + description of test_promise_2 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_2 + + + test_promise_1 + >%(base)s/subInstance-1/share/private/ + description of test_promise_1 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_1 + + +""", + 'subInstance-1/private/_document_list': """monitor.global""", + 'subInstance-1/private/monitor.global.json': """{"status": "ERROR", "_links": {"rss_url": {"href": "%(base)s/subInstance-1/public/feed"}, "public_url": {"href": "%(base)s/subInstance-1/share/public/"}, "private_url": {"href": "%(base)s/subInstance-1/share/private/"}}, "state": {"warning": 0, "success": 3, "error": 0}, "_embedded": {"instance": {"partition": "slappart1", "ipv6": "2001:67c:1254:e:c4::c748", "computer": "slaprunner", "ipv4": "10.0.165.37", "software-release": "http://xxx.yyy.zz/asoftware/software.cfg", "software-type": "pull-backup"}}, "parameters": [{"key": "", "value": "some parameter", "title": "demo"}], "title": "subInstance-1", "date": "2020-01-17 13:16:59", "type": "global", "hosting-title": "TEST Hosting Subscription", "data": {"process_state": "monitor_process_resource.status", "io_resource": "monitor_resource_io.data", "state": "monitor_state.data", "memory_resource": "monitor_resource_memory.data", "process_resource": "monitor_resource_process.data", "monitor_process_state": "monitor_resource.status"}}""", + 'subInstance-1/public/test_promise_0.json': """{"status": "ERROR", "change-time": 1579263419.247024, "instance": "subInstance-1", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_0", "_links": {"monitor": {"href": "%(base)s/subInstance-1/share/private/"}}, "message": "Test Promise ran with status ERROR", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-1/public/test_promise_1.json': """{"status": "ERROR", "change-time": 1579263419.247024, "instance": "subInstance-1", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_1", "_links": {"monitor": {"href": "%(base)s/subInstance-1/share/private/"}}, "message": "Test Promise ran with status ERROR", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-1/public/test_promise_2.json': """{"status": "ERROR", "change-time": 1579263419.247024, "instance": "subInstance-1", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_2", "_links": {"monitor": {"href": "%(base)s/subInstance-1/share/private/"}}, "message": "Test Promise ran with status ERROR", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-1/public/test_promise_3.json': """{"status": "ERROR", "change-time": 1579263419.247024, "instance": "subInstance-1", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_3", "_links": {"monitor": {"href": "%(base)s/subInstance-1/share/private/"}}, "message": "Test Promise ran with status ERROR", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/feed': """ + + + subInstance-2 + %(base)s/subInstance-2/public/feed + TEST Hosting Subscription + Fri, 17 Jan 2020 12:16:59 +0000 + %(base)s/gc//blogs.law.harvard.edu/tech/rss + + test_promise_5 + %(base)s/subInstance-2/share/private/ + description of test_promise_5 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_5 + + + test_promise_3 + %(base)s/subInstance-2/share/private/ + description of test_promise_3 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_3 + + + test_promise_6 + %(base)s/subInstance-2/share/private/ + description of test_promise_6 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_6 + + + test_promise_0 + %(base)s/subInstance-2/share/private/ + description of test_promise_0 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_0 + + + test_promise_2 + %(base)s/subInstance-2/share/private/ + description of test_promise_2 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_2 + + + test_promise_1 + %(base)s/subInstance-2/share/private/ + description of test_promise_1 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_1 + + + test_promise_4 + %(base)s/subInstance-2/share/private/ + description of test_promise_4 + OK + + VU5LTk9XTiwgc2xhcHJ1bm5l1579263419== + Fri, 17 Jan 2020 12:16:59 +0000 + test_promise_4 + + +""", + 'subInstance-2/public/test_promise_0.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_0", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/test_promise_1.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_1", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/test_promise_2.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_2", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/test_promise_3.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_3", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/test_promise_4.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_4", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/test_promise_5.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_5", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/public/test_promise_6.json': """{"status": "OK", "change-time": 1579263419.247408, "instance": "subInstance-2", "hosting_subscription": "TEST Hosting Subscription", "title": "test_promise_6", "_links": {"monitor": {"href": "%(base)s/subInstance-2/share/private/"}}, "message": "Test Promise ran with status OK", "start-date": "2020-01-17 13:16:59", "type": "status"}""", + 'subInstance-2/private/_document_list': """monitor.global""", + 'subInstance-2/private/monitor.global.json': """{"status": "OK", "_links": {"rss_url": {"href": "%(base)s/subInstance-2/public/feed"}, "public_url": {"href": "%(base)s/subInstance-2/share/public/"}, "private_url": {"href": "%(base)s/subInstance-2/share/private/"}}, "state": {"warning": 0, "success": 3, "error": 0}, "_embedded": {"instance": {"partition": "slappart1", "ipv6": "2001:67c:1254:e:c4::c748", "computer": "slaprunner", "ipv4": "10.0.165.37", "software-release": "http://xxx.yyy.zz/asoftware/software.cfg", "software-type": "pull-backup"}}, "parameters": [{"key": "", "value": "some parameter", "title": "demo"}], "title": "subInstance-2", "date": "2020-01-17 13:16:59", "type": "global", "hosting-title": "TEST Hosting Subscription", "data": {"process_state": "monitor_process_resource.status", "io_resource": "monitor_resource_io.data", "state": "monitor_state.data", "memory_resource": "monitor_resource_memory.data", "process_resource": "monitor_resource_process.data", "monitor_process_state": "monitor_resource.status"}}""", +}.get(path, None) + +if 'json' in path: + context.REQUEST.response.setHeader('Content-Type', 'application/json') + if value is None: + value = '{}' +if value is not None: + return value % {'base': base} diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulatorMapping.xml b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulatorMapping.xml new file mode 100644 index 0000000000000000000000000000000000000000..f7b08c0d0dd2acc6a7b7231ffcb72e4ee2fbb466 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/MonitorBackend_simulatorMapping.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + path + + + id + MonitorBackend_simulatorMapping + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringManualSynchronization.xml b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringManualSynchronization.xml new file mode 100644 index 0000000000000000000000000000000000000000..669b3e07d5f542f4b89769218d56a751c8ed8b5f --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringManualSynchronization.xml @@ -0,0 +1,58 @@ + + + + + + + + + + _bind_names + + + + + + + + + + _asgns + + + + name_subpath + traverse_subpath + + + + + + + + + + + content_type + text/html + + + expand + 0 + + + id + testMonitoringManualSynchronization + + + output_encoding + utf-8 + + + title + + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringManualSynchronization.zpt b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringManualSynchronization.zpt new file mode 100644 index 0000000000000000000000000000000000000000..2f383eacd114197b3643367a906f37ddc66bd212 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringManualSynchronization.zpt @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Synchronize manually
assertTextPresentTest is not finished yet, as in reality we have to check if synchronization had effect with data being added to the promises
+ + \ No newline at end of file diff --git a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringSyncNavigation.zpt b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringSyncNavigation.zpt index 241fbf195cd5c938e03063bce12e61b58e0790b7..dc11739c7e238503d48bed3ce907c75d55791cf5 100644 --- a/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringSyncNavigation.zpt +++ b/bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringSyncNavigation.zpt @@ -1,515 +1,280 @@ + xmlns:metal="http://xml.zope.org/namespaces/metal" + tal:define="global TEST_NAME string:Test SlapOS Monitoring UI Full Scenario"> - -Test SlapOS Monitoring UI (expected failure) + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Test SlapOS Monitoring UI (expected failure)
open${base_url}/bar_module/ListBoxZuite_reset
assertTextPresentReset Successfully.
open${base_url}/web_site_module/officejs_monitoring/
waitForElementPresent//a[@data-i18n='Monitoring Configurations']
click//a[@data-i18n='Synchronize']
waitForTextPresentSynchronizing Data...
waitForTextPresentSynchronisation finished
click//a[@data-i18n='Monitoring Configurations']
waitForElementPresent//button[@id="destroyOPML"]
click//input[@name='check_online_access']
click//button[@data-i18n='Save']
pause500
click//a[@data-i18n='Add']
waitForElementPresent//button[@data-i18n="Save"]
waitForElementPresent//a[@data-i18n='Change Password']
storehttp://localhost:5378/rootInstance/public/feedsopml_url
storerootInstanceinstance_root
storesubInstance-1instance_1
storeadminusername
storentpvmhkgpassword
typename=url${opml_url}
typename=username${username}
typename=password${password}
click//button[@data-i18n='Save']
pause1000
assertElementNotPresent//span[contains(@class, 'ui-text-error')]
pause500
waitForElementPresent//h1[@data-i18n='OPML Documents']
click//a[@data-i18n='Monitoring Configurations']
waitForElementPresent//button[@id="destroyOPML"]
pause3000
assertElementPresent//table[contains(@class, 'ui-table-inset')]
assertTextPresent${opml_url}
storeElementPresent//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/ahas_hosting
storeText//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/ahosting_title
click//a[@data-i18n='Synchronize']
waitForTextPresentSynchronizing Data...
waitForTextPresentSynchronisation finished
waitForElementPresent//h1[@data-i18n='Monitoring Promises']
click//a[@data-i18n='Hosting Subscriptions']
pause2000
assertTextPresent${hosting_title}
click//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a
waitForElementPresent//h1[@data-i18n='Software Instances']
pause2000
assertTextPresent${hosting_title}
assertTextPresent${instance_root}
assertTextPresent${instance_1}
click//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a
waitForElementPresent//a[@data-i18n='Instance: ${instance_root}']
assertTextPresent${hosting_title}
assertElementPresent//h1[@data-i18n='Instance Promises Status']
click//a[@data-i18n='Promises']
pause500
waitForElementPresent//h1[@data-i18n='Monitoring Promises']
assertElementPresent//span[@data-i18n="Monitoring Promises Status"]
assertTextPresent${hosting_title}
assertTextPresent${instance_root}
assertTextPresent${instance_1}
storeText//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/apromise_title
click//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a
waitForElementPresent//a[@data-i18n='Promise: ${promise_title}']
assertTextPresent${hosting_title}
assertElementPresent//h1[@data-i18n='Promise Status History']
assertElementPresent//span[contains(@class, 'label')]
open${base_url}/web_page_module/Zuite_waitForActivities
assertTextPresentDone.
open${base_url}/web_site_module/officejs_monitoring/app/#!display?n.page=settings_configurator
waitForElementPresent//a[@data-i18n='Monitoring Configurations']
pause2000
waitForElementPresent//h1[@data-i18n='OPML Documents']
pause2000
verifyText//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a${hosting_title}
click//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a
waitForElementPresent//a[@data-i18n='${hosting_title}']
click//button[@data-i18n='Save']
pause1000
typename=password${password}
click//input[@name='verify_password']
click//button[@data-i18n='Save']
pause1000
click//a[@data-i18n='Synchronize']
waitForTextPresentSynchronizing Data...
waitForTextPresentSynchronisation finished
click//a[@data-i18n='Monitoring Configurations']
waitForElementPresent//h1[@data-i18n='OPML Documents']
pause1000
verifyText//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a${hosting_title}
click//table[contains(@class, 'ui-table-inset')]/tbody/tr[1]/td[1]/a
pause500
waitForElementPresent//a[@data-i18n='${hosting_title}']
click//a[@data-i18n='Delete']
waitForElementPresent//h1[@data-i18n='OPML Documents']
pause1000
assertTextNotPresent${opml_url}
assertTextNotPresent${hosting_title}
click//a[@data-i18n='Hosting Subscriptions']
pause2000
assertTextNotPresent${hosting_title}
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Synchronize manually
Check Hosting Subscription
waitForElementPresent//a[text()='${MONITORING_HOSTING_TITLE}']
assertElementPresent//a[text()='${MONITORING_HOSTING_TITLE}']
click//a[text()='${MONITORING_HOSTING_TITLE}']
Navigate to the root instance
click//a[text()='${MONITORING_INSTANCE_ROOT}']
waitForElementPresent//a[@data-i18n='Instance: ${MONITORING_INSTANCE_ROOT}']
assertElementPresent//a[@data-i18n='Instance: ${MONITORING_INSTANCE_ROOT}']
assertElementPresent//h1[contains(.,'Instance Promises Status')]
Display list of promises
click//a[@data-i18n='Promises']
Check the promise
click//a[text()='${MONITORING_PROMISE_TITLE}']
waitForElementPresent//a[@data-i18n='Promise: ${MONITORING_PROMISE_TITLE}']
assertElementPresent//a[@data-i18n='Promise: ${MONITORING_PROMISE_TITLE}']
assertTextPresent${MONITORING_HOSTING_TITLE}
Let the backend process all work
open${base_url}/web_page_module/Zuite_waitForActivities
assertTextPresentDone.
Update the Hosting Subscription
open${base_url}/web_site_module/officejs_monitoring/app/#!display?n.page=settings_configurator
waitForElementPresent//a[@data-i18n='Monitoring Configurations']
assertElementPresent//a[@data-i18n='Monitoring Configurations']
assertElementPresent//a[text()='${MONITORING_HOSTING_TITLE}']
click//a[text()='${MONITORING_HOSTING_TITLE}']
waitForElementPresent//a[@data-i18n='${MONITORING_HOSTING_TITLE}']
assertElementPresent//a[@data-i18n='${MONITORING_HOSTING_TITLE}']
typename=password${MONITORING_PASSWORD}
click//input[@name='verify_password']
Delete the Hosting Subscription
assertElementPresent//a[text()='${MONITORING_HOSTING_TITLE}']
click//a[text()='${MONITORING_HOSTING_TITLE}']
waitForElementPresent//a[@data-i18n='${MONITORING_HOSTING_TITLE}']
assertElementPresent//a[@data-i18n='${MONITORING_HOSTING_TITLE}']
click//a[@data-i18n='Delete']
assertTextNotPresent${MONITORING_OPML_URL}
assertTextNotPresent${MONITORING_HOSTING_TITLE}
click//a[@data-i18n='Hosting Subscriptions']
assertTextNotPresent${MONITORING_HOSTING_TITLE}
+ \ No newline at end of file diff --git a/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test.xml b/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test.xml new file mode 100644 index 0000000000000000000000000000000000000000..6989db250a85d3d713ae3f0f208d79f7555eb3b0 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test.xml @@ -0,0 +1,26 @@ + + + + + + + + + + _objects + + + + + + id + erp5_web_monitoring_ui_test + + + title + + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test/Zuite_CommonTemplateForMonitoringUi.xml b/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test/Zuite_CommonTemplateForMonitoringUi.xml new file mode 100644 index 0000000000000000000000000000000000000000..8b7f82d73ccf40ad53910a71b396e2d1886f19fe --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test/Zuite_CommonTemplateForMonitoringUi.xml @@ -0,0 +1,79 @@ + + + + + + + + + + _bind_names + + + + + + + + + + _asgns + + + + name_subpath + traverse_subpath + + + + + + + + + + + _local_properties + + + + + id + description + + + type + text + + + + + + + content_type + text/html + + + description + + + + expand + 0 + + + id + Zuite_CommonTemplateForMonitoringUi + + + output_encoding + utf-8 + + + title + Common Template for All Monitoring ui Zuite + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test/Zuite_CommonTemplateForMonitoringUi.zpt b/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test/Zuite_CommonTemplateForMonitoringUi.zpt new file mode 100644 index 0000000000000000000000000000000000000000..a978d0fc67238de06a1e618963541a6737110721 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/SkinTemplateItem/portal_skins/erp5_web_monitoring_ui_test/Zuite_CommonTemplateForMonitoringUi.zpt @@ -0,0 +1,300 @@ + + + + Remove all OPML + + + + + + + TODO: Not the best way to find the button... + + + waitForElementPresent + //button[contains(., 'Remove All OPML')] + + + + assertElementPresent + //button[contains(., 'Remove All OPML')] + + + + click + //button[contains(., 'Remove All OPML')] + + + + waitForElementPresent + //button[contains(., '[Confirm]')] + + + + assertElementPresent + //button[contains(., '[Confirm]')] + + + + click + //button[contains(., '[Confirm]')] + + + + + + + + + TODO: Needed to navigate out from the page to work... + + + + + + + + + Add monitoring endpoint + + + + + + + click + //input[@name='check_online_access'] + + + + + + + + + type + name=url + ${MONITORING_OPML_URL} + + + type + name=username + ${MONITORING_USERNAME} + + + type + name=password + ${MONITORING_PASSWORD} + + + click + //button[@data-i18n='Save'] + + + + assertElementNotPresent + //span[contains(@class, 'ui-text-error')] + + + + waitForElementPresent + //span[@data-i18n='Monitoring Promises Status'] + + + + assertElementPresent + //span[@data-i18n='Monitoring Promises Status'] + + + + + + + + waitForElementPresent + //button[@id="destroyOPML"] + + + + assertElementPresent + //button[@id="destroyOPML"] + + + + waitForElementPresent + //a["${MONITORING_OPML_URL}"] + + + + assertElementPresent + //a["${MONITORING_OPML_URL}"] + + + + + + Monitoring UI Zuite Setup + + + store + + MONITORING_INSTANCE_ROOT + + + store + + MONITORING_INSTANCE_1 + + + store + + MONITORING_INSTANCE_2 + + + store + + MONITORING_USERNAME + + + store + + MONITORING_PASSWORD + + + store + + MONITORING_HOSTING_TITLE + + + store + http://example.com/erp5 + MONITORING_SIMULATOR_URL + + + store + ${MONITORING_SIMULATOR_URL}/rootInstance/public/feeds + MONITORING_OPML_URL + + + store + test_promise_2 + MONITORING_PROMISE_TITLE + + + Cleanup + + + open + ${base_url}/bar_module/ListBoxZuite_reset + + + + assertTextPresent + Reset Successfully. + + + + Initialize + + + open + ${base_url}/web_site_module/officejs_monitoring/ + + + + + + + + Click on Save + + + waitForElementPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//button[@data-i18n='Save'] + + + + assertElementPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//button[@data-i18n='Save'] + + + + waitForElementNotPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//button[@data-i18n='Save'][contains(@class, "ui-disabled")] + + + + assertElementNotPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//button[@data-i18n='Save'][contains(@class, "ui-disabled")] + + + + assertElementPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//button[@data-i18n='Save'] + + + + click + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//button[@data-i18n='Save'] + + + + + + + Save + + + + verifyElementPresent + //button[@data-i18n="Save"][contains(@class, "ui-disabled")] + + + + + + + + + verifyElementPresent + //button[@data-i18n="Save"][contains(@class, "ui-icon-check")] + + + +

+ + + + + Wait for the content to be loaded + + + waitForElementPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//h1//*[contains(@class, "ui-icon-spinner")] + + + + waitForElementNotPresent + //div[contains(@data-gadget-url, 'gadget_officejs_monitoring_header.html')]//h1//*[contains(@class, "ui-icon-spinner")] + + + + + pause + 100 + + + +

+ + + \ No newline at end of file diff --git a/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.py b/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.py index 143d5299fe8a133ce27928c78836994995430f38..d4aa3f29ceaecec992aa6f35301a64233fc4a071 100644 --- a/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.py +++ b/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.py @@ -27,285 +27,19 @@ import unittest from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctionalTestCase -from SimpleHTTPServer import SimpleHTTPRequestHandler -from threading import Thread -from datetime import datetime -import SocketServer -import tempfile -import shutil -import time -import os -import json - -class CustomHTTPRequestHandler(SimpleHTTPRequestHandler): - def end_headers(self): - self.send_my_headers() - - SimpleHTTPRequestHandler.end_headers(self) - - def send_respond(self, code=200, content_type='text/html'): - self.send_response(code) - self.send_header("Content-type", content_type) - self.end_headers() - - def send_my_headers(self): - self.send_header("Access-Control-Allow-Origin", "*") - self.send_header("Access-Control-Allow-Methods", "HEAD, OPTIONS, GET, POST") - self.send_header("Access-Control-Allow-Headers", "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization") - - def do_GET(self): - SimpleHTTPRequestHandler.do_GET(self) - - def do_OPTIONS(self): - self.send_respond(200) - - def do_HEAD(self): - self.send_respond() - -class TestZeleniumCore(ERP5TypeFunctionalTestCase): +class TestFunctionalOfficejsMonitoring(ERP5TypeFunctionalTestCase): foreground = 0 run_only = "web_monitoring_ui_zuite" - base_url = 'http://localhost:5378' - instance_list = [] - httpd = None - httpd_is_alive = False - root_title = "TEST Hosting Subscription" - - def start_httpd_server(self, root_folder): - self.httpd = SocketServer.TCPServer(('localhost', 5378), CustomHTTPRequestHandler) - self.httpd.timeout = 2 - os.chdir(root_folder) - #self.httpd.serve_forever() - while self.httpd_is_alive: - self.httpd.handle_request() - - self.httpd = None - - def afterSetUp(self): - ERP5TypeFunctionalTestCase.afterSetUp(self) - - self.http_root_dir = tempfile.mkdtemp() - print "Serving files on http from %r" % self.http_root_dir - - self.generateMonitoringInstanceTree() - self.httpd_is_alive = True - thread = Thread(target=self.start_httpd_server, args=(self.http_root_dir,)) - thread.daemon = True - thread.start() - - def beforeTearDown(self): - self.httpd_is_alive = False - # Wait for httpd server stop - time.sleep(3) - if os.path.exists(self.http_root_dir): - shutil.rmtree(self.http_root_dir) - ERP5TypeFunctionalTestCase.beforeTearDown(self) def getBusinessTemplateList(self): return ( - 'erp5_ui_test', 'erp5_web_monitoring', + 'erp5_web_monitoring_ui_test', 'erp5_ui_test_core', ) - def generateInstanceDirectory(self, name): - root_dir = os.path.join(self.http_root_dir, name) - public_http_dir = os.path.join(root_dir, 'public') - private_http_dir = os.path.join(root_dir, 'private') - webdav_http_dir = os.path.join(root_dir, 'share') - os.mkdir(root_dir) - os.mkdir(public_http_dir) - os.mkdir(private_http_dir) - os.mkdir(webdav_http_dir) - - webdav_public_dir = os.path.join(webdav_http_dir, 'public') - webdav_private_dir = os.path.join(webdav_http_dir, 'private') - - os.symlink(public_http_dir, webdav_public_dir) - os.symlink(private_http_dir, webdav_private_dir) - - instance = dict( - title=name, - public_dir=public_http_dir, - private_dir=private_http_dir, - url=self.base_url + '/' + name - ) - self.instance_list.append(instance) - return instance - - def generatePromiseResult(self, instance, status='OK', amount=1): - now_time = time.time() - start_date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time())) - - for i in range(0, amount): - title = 'test_promise_%s' % i - result_dict = { - "status": status, - "change-time": now_time, - "hosting_subscription": self.root_title, - "title": title, - "start-date": start_date, - "instance": instance['title'], - "_links": { - "monitor": { - "href": "%s/share/private/" % instance['url'] - } - }, - "message": "Test Promise ran with status %s" % status, - "type": "status" - } - with open(os.path.join(instance['public_dir'], '%s.json' % title), 'w') as f: - f.write(json.dumps(result_dict)) - - def generateOPMLFile(self, instance, sub_instance_list=[]): - creation_date = datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S +0000") - opml_content = """ - - - - %(root_title)s - %(creation_date)s - %(creation_date)s - - - """ % { - "root_title": self.root_title, - "creation_date": creation_date - } - opml_content += '\n' % { - "title": instance['title'], - "html_url": '%s/public/feed' % instance['url'], - "global_url": "%s/share/private/" % instance['url'], - } - for sub_instance in sub_instance_list: - opml_content += '\n' % { - "title": sub_instance['title'], - "html_url": '%s/public/feed' % sub_instance['url'], - "global_url": "%s/share/private/" % sub_instance['url'], - } - - opml_content += """ - -""" - - with open(os.path.join(instance['public_dir'], 'feeds'), 'w') as f: - f.write(opml_content) - - - def generateInstanceRssFeed(self, instance): - promise_list = [name.rstrip('.json') - for name in os.listdir(instance['public_dir']) if name.endswith('.json')] - rss_content = """ - -%(instance)s -%(link)s -%(description)s -%(date)s -http://blogs.law.harvard.edu/tech/rss""" % { - "description": self.root_title, - "link": '%s/public/feed' % instance['url'], - "instance": instance['title'], - "date": datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S +0000") - } - - for promise in promise_list: - item = """ -%(title)s - -%(base_url)s/share/private/ - -%(description)s -%(status)s - -VU5LTk9XTiwgc2xhcHJ1bm5l%(id)s== -%(date)s -%(title)s -""" % { - "base_url": instance['url'], - "title": promise, - "status": "OK", - "description": "description of %s" % promise, - "id": int(time.time()), - "date": datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S +0000") - } - - rss_content += item - - rss_content += """""" - - with open(os.path.join(instance['public_dir'], 'feed'), 'w') as f: - f.write(rss_content.replace('\n', '')) - - def generateMonitoringStatusFile(self, instance, status="OK"): - monitor_dict = { - "status": status, - "state": { - "warning": 0, - "success": 3, - "error": 0 - }, - "title": instance['title'], - "date": datetime.now().strftime('%Y-%m-%d %H:%M:%S'), - "data": { - "process_state": "monitor_process_resource.status", - "io_resource": "monitor_resource_io.data", - "state": "monitor_state.data", - "memory_resource": "monitor_resource_memory.data", - "process_resource": "monitor_resource_process.data", - "monitor_process_state": "monitor_resource.status" - }, - "hosting-title": self.root_title, - "type": "global", - "_embedded": { - "instance": { - "partition": "slappart1", - "ipv6": "2001:67c:1254:e:c4::c748", - "computer": "slaprunner", - "ipv4": "10.0.165.37", - "software-release": "http://xxx.yyy.zz/asoftware/software.cfg", - "software-type": "pull-backup" - } - }, - "parameters": [{"title": "demo", "value": "some parameter", "key": ""}], - "_links": { - "rss_url": { - "href": "%s/public/feed" % instance['url'] - }, - "public_url": { - "href": "%s/share/public/" % instance['url'] - }, - "private_url": { - "href": "%s/share/private/" % instance['url'] - } - } - } - - with open(os.path.join(instance['private_dir'], 'monitor.global.json'), 'w') as f: - f.write(json.dumps(monitor_dict)) - with open(os.path.join(instance['private_dir'], '_document_list'), 'w') as f: - f.write("monitor.global") - - def generateMonitoringInstanceTree(self): - # root instance - root_instance = self.generateInstanceDirectory("rootInstance") - self.generatePromiseResult(root_instance, status='OK', amount=5) - self.generateInstanceRssFeed(root_instance) - self.generateMonitoringStatusFile(root_instance, status='OK') - # sub instance1 - sub_instance1 = self.generateInstanceDirectory("subInstance-1") - self.generatePromiseResult(sub_instance1, status='ERROR', amount=4) - self.generateInstanceRssFeed(sub_instance1) - self.generateMonitoringStatusFile(sub_instance1, status='ERROR') - # sub instance2 - sub_instance2 = self.generateInstanceDirectory("subInstance-2") - self.generatePromiseResult(sub_instance2, status='OK', amount=7) - self.generateInstanceRssFeed(sub_instance2) - self.generateMonitoringStatusFile(sub_instance2, status='OK') - - self.generateOPMLFile(root_instance, [sub_instance1, sub_instance2]) - def test_suite(): suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(TestZeleniumCore)) + suite.addTest(unittest.makeSuite(TestFunctionalOfficejsMonitoring)) return suite \ No newline at end of file diff --git a/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.xml b/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.xml index 3e354b3d15e74602cdbcea2331ef535d7879f855..9f6a64aa14c65b765b2cf60f4faa8ed2af786d5c 100644 --- a/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.xml +++ b/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.xml @@ -45,9 +45,7 @@ text_content_warning_message - - W:161, 2: Dangerous default value [] as argument (dangerous-default-value) - + @@ -102,24 +100,28 @@ - + - - - - - - action - validate - - - validation_state - validated - - - - + + + _log + + + + + action + validate + + + validation_state + validated + + + + + + diff --git a/bt5/erp5_web_monitoring_ui_test/bt/dependency_list b/bt5/erp5_web_monitoring_ui_test/bt/dependency_list index bd8266d0d5ade925742e9192cd5528c9d70168f4..7d3a5655b3fe2e2e876f596aab5172173d3b2b5a 100644 --- a/bt5/erp5_web_monitoring_ui_test/bt/dependency_list +++ b/bt5/erp5_web_monitoring_ui_test/bt/dependency_list @@ -1,3 +1,4 @@ erp5_ui_test_core erp5_ui_test -erp5_web_monitoring \ No newline at end of file +erp5_web_monitoring +erp5_officejs_ui_test \ No newline at end of file diff --git a/bt5/erp5_web_monitoring_ui_test/bt/skip_coding_style_test b/bt5/erp5_web_monitoring_ui_test/bt/skip_coding_style_test deleted file mode 100644 index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000 --- a/bt5/erp5_web_monitoring_ui_test/bt/skip_coding_style_test +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/bt5/erp5_web_monitoring_ui_test/bt/template_skin_id_list b/bt5/erp5_web_monitoring_ui_test/bt/template_skin_id_list new file mode 100644 index 0000000000000000000000000000000000000000..9b501691ba7d883bc87c3a8b45cfc533673e83f9 --- /dev/null +++ b/bt5/erp5_web_monitoring_ui_test/bt/template_skin_id_list @@ -0,0 +1 @@ +erp5_web_monitoring_ui_test \ No newline at end of file diff --git a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_getPrecacheManifest.py b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_getPrecacheManifest.py index 04bd3e8040855b91889405c3c27566551684ee5a..ec6bf4eed71c93b1eb52a976eb83af01e8bbd8d9 100644 --- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_getPrecacheManifest.py +++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_getPrecacheManifest.py @@ -64,7 +64,7 @@ url_list = [ 'gadget_erp5_form.html', 'gadget_erp5_form.js', 'gadget_erp5_header.html', - # 'gadget_erp5_header.js', + 'gadget_erp5_header.js', 'gadget_erp5_jio.html', 'gadget_erp5_jio.js', 'gadget_erp5_label_field.html', diff --git a/bt5/erp5_web_renderjs_ui/bt/skip_coding_style_test b/bt5/erp5_web_renderjs_ui/bt/skip_coding_style_test deleted file mode 100644 index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..0000000000000000000000000000000000000000 --- a/bt5/erp5_web_renderjs_ui/bt/skip_coding_style_test +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.test_kaz.py b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.test_kaz.py new file mode 100644 index 0000000000000000000000000000000000000000..22c578042cffdb5d133f35859489c0d21297536e --- /dev/null +++ b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.test_kaz.py @@ -0,0 +1,12 @@ + +def getObjectByOid(self, oid):#XXXYYY + ob = self._p_jar[oid] + #return ob + result = [ob.__class__,] + n = 1 + for k,v in ob.iteritems(): + result.append((k, k.__class__,v, v.__class__)) + n += 1 + if n > 100: + break + return result \ No newline at end of file diff --git a/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.test_kaz.xml b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.test_kaz.xml new file mode 100644 index 0000000000000000000000000000000000000000..5fce63fd62791d7f1cb4fd2b679b21c092ec3a45 --- /dev/null +++ b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.test_kaz.xml @@ -0,0 +1,127 @@ + + + + + + + + + + _recorded_property_dict + + AAAAAAAAAAI= + + + + default_reference + test_kaz + + + description + + + + + + id + extension.erp5.test_kaz + + + portal_type + Extension Component + + + sid + + + + + + text_content_error_message + + + + + + text_content_warning_message + + + + + + version + erp5 + + + workflow_history + + AAAAAAAAAAM= + + + + + + + + + + + + + data + + + + + + + + + + + + + + + data + + + + component_validation_workflow + + AAAAAAAAAAQ= + + + + + + + + + + + + + + + + _log + + + + + action + validate + + + validation_state + validated + + + + + + + + + diff --git a/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.testrc.py b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.testrc.py new file mode 100644 index 0000000000000000000000000000000000000000..7c26b7b510a9eceb32f9aacaf27fa415f0dad8a7 --- /dev/null +++ b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.testrc.py @@ -0,0 +1,20 @@ +def testrc(self): + result = '' + portal = self.getPortalObject() + + selection = portal.portal_selections.getSelectionFor('person_module_selection') + key_list = selection.__dict__.keys() + key_list.sort() + for key in key_list: + result += '%s: %s\n' % (key, selection.__dict__[key]) + return result + return str(selection.__dict__) + + print selection.checked_uids + print selection.domain_path + print selection.domain_list + if selection.domain is not None: + print selection.domain.asDomainDict() + + return printed + return 'couscous' \ No newline at end of file diff --git a/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.testrc.xml b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.testrc.xml new file mode 100644 index 0000000000000000000000000000000000000000..1a034b67eb273c6e55df039e3a281aab7af004e9 --- /dev/null +++ b/bt5/romain_dev/ExtensionTemplateItem/portal_components/extension.erp5.testrc.xml @@ -0,0 +1,127 @@ + + + + + + + + + + _recorded_property_dict + + AAAAAAAAAAI= + + + + default_reference + testrc + + + description + + + + + + id + extension.erp5.testrc + + + portal_type + Extension Component + + + sid + + + + + + text_content_error_message + + + + + + text_content_warning_message + + + + + + version + erp5 + + + workflow_history + + AAAAAAAAAAM= + + + + + + + + + + + + + data + + + + + + + + + + + + + + + data + + + + component_validation_workflow + + AAAAAAAAAAQ= + + + + + + + + + + + + + + + + _log + + + + + action + validate + + + validation_state + validated + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_abstract.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_abstract.png new file mode 100644 index 0000000000000000000000000000000000000000..8fbe465b5350ccc72f55a513a15472ae427d1e85 Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_abstract.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_abstract.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_abstract.xml new file mode 100644 index 0000000000000000000000000000000000000000..059bd7846ccd3ff1d75484b1dc88806383cad3e5 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_abstract.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + 3c07e11f695f1b835e35c40ad9053921 + + + content_type + image/png + + + default_reference + abstract.png + + + description + + + + + + filename + Abstract-Background-PNG-Background.png + + + height + 811 + + + id + romain_wallpaper_abstract + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + abstract wallpaper + + + version + + + + + + width + 1000 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1570031850.28 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 978.55869.33097.28450 + + + state + current + + + time + + + + + + + + + + + 1570031865.37 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_automn.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_automn.png new file mode 100644 index 0000000000000000000000000000000000000000..801b01b6237a136b3279995aee5de5ae1f8b34d0 Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_automn.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_automn.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_automn.xml new file mode 100644 index 0000000000000000000000000000000000000000..62a12a02f18a5ea8aa0ebab04d9695af517564e0 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_automn.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + 8793a163fd5752913f4955ee05429103 + + + content_type + image/png + + + default_reference + autumn.png + + + description + + + + + + filename + kissclipart-leaf-autumn-png-clipart-autumn-desktop-wallpaper-b109dc9b0688af64.png + + + height + 900 + + + id + romain_wallpaper_automn + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + Autumn wallpaper + + + version + + + + + + width + 900 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1574439611.96 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 979.63793.28759.15121 + + + state + current + + + time + + + + + + + + + + + 1574439606.56 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_complex.jpg b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_complex.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6d2307de8307725ebfbde31e92b391c9d455a359 Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_complex.jpg differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_complex.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_complex.xml new file mode 100644 index 0000000000000000000000000000000000000000..fdcfcaad32934699127dc9bfd7b1009f77bd80d2 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_complex.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + 63b8a650f482bb9658c4f11ca90a1074 + + + content_type + image/jpeg + + + default_reference + complex.jpg + + + description + + + + + + filename + 2724.jpg + + + height + 720 + + + id + romain_wallpaper_complex + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + Complex wallpaper + + + version + + + + + + width + 1280 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1574436883.19 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 979.63750.47190.38195 + + + state + current + + + time + + + + + + + + + + + 1574436911.02 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_grumpy.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_grumpy.png new file mode 100644 index 0000000000000000000000000000000000000000..f73ceef33bbbc52948f0faaa82a457ea8acb0401 Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_grumpy.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_grumpy.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_grumpy.xml new file mode 100644 index 0000000000000000000000000000000000000000..05b1cc36b816c8bcd1232608f683057c17e69448 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_grumpy.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + 0902777a614513139cc299ba6f1c4e9c + + + content_type + image/png + + + default_reference + grumpy.png + + + description + + + + + + filename + 30251-grumpy-cat-1920x1200-meme-wallpaper.jpg.png + + + height + 1200 + + + id + romain_wallpaper_grumpy + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + Grumpy wallpaper + + + version + + + + + + width + 1920 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1567673769.31 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 978.16649.15269.28774 + + + state + current + + + time + + + + + + + + + + + 1567765047.39 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_hobbes.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_hobbes.png new file mode 100644 index 0000000000000000000000000000000000000000..3bc113b595c36ddfda710296dce8cbfaf3e98898 Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_hobbes.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_hobbes.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_hobbes.xml new file mode 100644 index 0000000000000000000000000000000000000000..d769986845f472bf9b0e623ae15bde2b486defe1 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_hobbes.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + 2d3df245db0395fb3ab10e45fd9253ce + + + content_type + image/png + + + default_reference + hobbes.png + + + description + + + + + + filename + Download-Calvin-And-Hobbes-PNG-Pic.png + + + height + 800 + + + id + romain_wallpaper_hobbes + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + Hobbes wallpaper + + + version + + + + + + width + 1280 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1570615836.3 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 979.64.7806.57088 + + + state + current + + + time + + + + + + + + + + + 1570615726.62 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_noel.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_noel.png new file mode 100644 index 0000000000000000000000000000000000000000..aba7b7c987c5415f6ce4f6e73ff11d7340b1e89a Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_noel.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_noel.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_noel.xml new file mode 100644 index 0000000000000000000000000000000000000000..9224311f94c9adb1b94fcb07ed68a25c7e9e3187 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_noel.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + bc3cfa98569409f740865db09f48a841 + + + content_type + image/png + + + default_reference + noel.png + + + description + + + + + + filename + tOE6gh.png + + + height + 900 + + + id + romain_wallpaper_noel + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + Noel wallpaper + + + version + + + + + + width + 1600 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1574438027.23 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 979.63769.51607.43554 + + + state + current + + + time + + + + + + + + + + + 1574438036.32 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_spiro.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_spiro.png new file mode 100644 index 0000000000000000000000000000000000000000..a28d3fd8e7a304ad796586f6979ef60a81994a2f Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_spiro.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_spiro.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_spiro.xml new file mode 100644 index 0000000000000000000000000000000000000000..9a94ac2e1ef336c6981a9ae621b652f4aceb4884 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_spiro.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + 9309540502bd63fce275cd35ba892202 + + + content_type + image/png + + + default_reference + spiro.png + + + description + + + + + + filename + téléchargement.png + + + height + 960 + + + id + romain_wallpaper_spiro + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + spiro wallpaper + + + version + + + + + + width + 960 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1570178217.71 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 978.58308.63059.29644 + + + state + current + + + time + + + + + + + + + + + 1570178230.57 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_waves.png b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_waves.png new file mode 100644 index 0000000000000000000000000000000000000000..ea144319f69fcac6cffb4e87e0e824f4b78ccb9f Binary files /dev/null and b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_waves.png differ diff --git a/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_waves.xml b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_waves.xml new file mode 100644 index 0000000000000000000000000000000000000000..ba0ef9ab9a75187170f7bef2f6d889558042ab36 --- /dev/null +++ b/bt5/romain_dev/PathTemplateItem/image_module/romain_wallpaper_waves.xml @@ -0,0 +1,321 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Assignee + Assignor + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _count + + AAAAAAAAAAI= + + + + _mt_index + + AAAAAAAAAAM= + + + + _tree + + AAAAAAAAAAQ= + + + + content_md5 + e8a3742b8e736deed9840baa61bab611 + + + content_type + image/png + + + default_reference + waves.png + + + description + + + + + + filename + Waves.png + + + height + 795 + + + id + romain_wallpaper_waves + + + language + + + + + + portal_type + Image + + + short_title + + + + + + title + waves wallpaper + + + version + + + + + + width + 979 + + + workflow_history + + AAAAAAAAAAU= + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAY= + + + + edit_workflow + + AAAAAAAAAAc= + + + + + + + + + + + + + + + + _log + + + + + action + publish_alive + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1570178971.23 + UTC + + + + + + + validation_state + published_alive + + + + + + + + + + + + + + + + _log + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 978.58321.34125.43554 + + + state + current + + + time + + + + + + + + + + + 1570178983.55 + UTC + + + + + + + + + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev.xml new file mode 100644 index 0000000000000000000000000000000000000000..550c27e5f5af3c1a8d837905e2541eb8b0241d01 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev.xml @@ -0,0 +1,47 @@ + + + + + + + + + + _local_properties + + + + + id + business_template_skin_layer_priority + + + type + float + + + + + + + _objects + + + + + + business_template_skin_layer_priority + 51.0 + + + id + romain_dev + + + title + + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Base_getUpgradeBusinessTemplateList.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Base_getUpgradeBusinessTemplateList.py new file mode 100644 index 0000000000000000000000000000000000000000..2301ffb92302d471e3cce6bb37941acd6bdb456f --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Base_getUpgradeBusinessTemplateList.py @@ -0,0 +1,51 @@ +bt5_update_catalog_list = ('erp5_ingestion_mysql_innodb_catalog', 'erp5_full_text_mroonga_catalog') +bt5_installation_list = bt5_update_catalog_list + ('erp5_xhtml_style', + # 'erp5_officejs', 'erp5_web_jabber_client', + # 'erp5_officejs_ooffice', + 'erp5_upgrader', + 'erp5_hal_json_style', + 'erp5_ods_style', + 'erp5_odt_style', + 'erp5_deferred_style', + # 'erp5_officejs_ui_test', + 'erp5_crm_renderjs_ui_test', + 'erp5_trade_renderjs_ui_test', + 'erp5_web_renderjs_ui_test', + 'erp5_pdm_renderjs_ui_test', + 'erp5_accounting_renderjs_ui_test', + 'erp5_item_renderjs_ui_test', + # 'erp5_officejs_ui_test', + 'erp5_officejs_support_request_ui_test', + # 'erp5_calendar', + # 'erp5_crm', + # 'erp5_mrp', + 'erp5_project', + 'erp5_bank_reconciliation', + + # test dependencies + # 'erp5_configurator_standard_trade_template', + # 'erp5_simulation_test', + # 'erp5_accounting', + # 'erp5_monaco_editor_ui_test', + + # 'erp5_gadget_interface_validator_ui_test', + 'erp5_forge', + # 'erp5_web_jabber_client', + 'erp5_web_ui_test', + 'erp5_officejs_afs_directory_ui_test', + 'erp5_accounting_ui_test', + 'erp5_dms_ui_test', + # 'erp5_travel_expense', 'erp5_travel_expense_ui_test', + # 'officejs_olapy_demo', 'erp5_officejs_connector' + # 'erp5_discussion' + 'erp5_hr', + 'erp5_item', + 'erp5_mrp', + 'erp5_payroll', + 'erp5_authentication_policy', + 'erp5_l10n_fr', + 'erp5_mrp_item', + 'erp5_discount_resource', + 'erp5_administration', + ) +return bt5_installation_list, [] diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Base_getUpgradeBusinessTemplateList.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Base_getUpgradeBusinessTemplateList.xml new file mode 100644 index 0000000000000000000000000000000000000000..a5789def3f63d3f175d96ab5d0b14250a323184c --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Base_getUpgradeBusinessTemplateList.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + id + Base_getUpgradeBusinessTemplateList + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Couscous_deleteIfExpectedId.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Couscous_deleteIfExpectedId.py new file mode 100644 index 0000000000000000000000000000000000000000..dde93cfba6aaa0f7af05d3e89e62decc664cbd38 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Couscous_deleteIfExpectedId.py @@ -0,0 +1,11 @@ +can_delete = False +document_id = context.getId() +try: + can_delete = (document_id == str(int(document_id))) +except: + pass + +if can_delete: + context.getParentValue().manage_delObjects(ids=[document_id]) + return 'deleted' +return 'not deleted' diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Couscous_deleteIfExpectedId.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Couscous_deleteIfExpectedId.xml new file mode 100644 index 0000000000000000000000000000000000000000..30021207cdb02f779899ab471672d291fa565542 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/Couscous_deleteIfExpectedId.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + id + Couscous_deleteIfExpectedId + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/ERP5Site_setupModuleList.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/ERP5Site_setupModuleList.py new file mode 100644 index 0000000000000000000000000000000000000000..6e130b5f5d2922dfab20d75b3ac534a0500cc336 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/ERP5Site_setupModuleList.py @@ -0,0 +1,42 @@ +portal = portal = context.getPortalObject() + +module_business_application_map = {'base': ('currency_module', + 'organisation_module', + 'person_module',), + 'accounting': ('accounting_module', + 'account_module',), + 'forge': ('bug_module', 'glossary_module', 'test_result_module', 'test_suite_module'), + 'dev': ('foo_module', 'bar_module', 'foo_bar_module'), + 'project': ('project_module', 'task_module', 'task_report_module'), + 'crm': ('campaign_module', + 'event_module', + 'meeting_module', + 'sale_opportunity_module', + 'support_request_module',), + 'dms': ('document_module', + 'image_module', + 'document_ingestion_module', + 'web_page_module',), + 'trade': ('internal_packing_list_module', + 'inventory_module', + 'purchase_order_module', + 'purchase_packing_list_module', + 'purchase_trade_condition_module', + 'returned_sale_packing_list_module', + 'sale_order_module', + 'sale_packing_list_module', + 'sale_trade_condition_module'), + 'pdm': ('component_module', + 'product_module', + 'purchase_supply_module', + 'sale_supply_module', + 'service_module', + 'transformation_module',), + } + +for business_application_category_id, module_ids in module_business_application_map.items(): + for module_id in module_ids: + module = getattr(portal, module_id, None) + if module is not None: + module.edit(business_application = business_application_category_id) +return 'ok' diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/ERP5Site_setupModuleList.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/ERP5Site_setupModuleList.xml new file mode 100644 index 0000000000000000000000000000000000000000..702c12e44da093172eafc37fcf6b8846c78bf7c8 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/ERP5Site_setupModuleList.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + id + ERP5Site_setupModuleList + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/copy_of_testromain.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/copy_of_testromain.py new file mode 100644 index 0000000000000000000000000000000000000000..5b5744b81124fedceb8375528bad9ac2fae7f53c --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/copy_of_testromain.py @@ -0,0 +1,72 @@ +portal = context.getPortalObject() + +selection = portal.portal_selections.getSelectionFor('person_module_selection') + +print selection.checked_uids +print selection.domain_path +print selection.domain_list +if selection.domain is not None: + print selection.domain.asDomainDict() + +return printed + + +for _, obj in portal.portal_skins.ZopeFind(portal.portal_skins.erp5_core, obj_metatypes=('ERP5 Form',), search_sub=1): + if (obj.pt == 'form_view') and (obj.action == '') and ('FieldLibrary' not in obj.id): + print obj.id + +return printed + + + + +return + +portal_object = portal = context.getPortalObject() +module = portal.person_module + +i = counter +while i <= min(counter + 100, 80000): + # module.newContent(portal_type='Person', title='test %i' % i) + i += 1 + +if i != counter: + module.activate(activity='SQLQueue', priority=5).testromain(i) + +return 'couscous' + +raise NotImplementedError('nutnut') +return '%s\n' % context.absolute_url() + +from base64 import urlsafe_b64encode, urlsafe_b64decode +return 'data:text/css;base64,%s' % urlsafe_b64encode('couscous'); + +kw = { + # 'select_dict': {'count': 'select 1;drop table catalog;', 'portal_type': None}, + 'select_dict': {'count': 'count(*)', 'portal_type': None}, + # 'select_list': ['count(*)', 'portal_type'], + # 'select_list': ['portal_type'], + 'limit': None, + 'group_by': ["portal_type"], + # 'sort_on': [('portal_type', 'ASC')] +} + +print context.portal_catalog(src__=1, **kw) +""" +for x in context.portal_catalog(**kw): + print x.portal_type, x['count'] +""" +print '---' +return printed + +cp = context.manage_copyObjects(uids=uids) +context.manage_pasteObjects(cb_copy_data=cp) +return "couscous" + +""" +result_list = context.portal_catalog.countResults(select_dict={'date': 'DATE_FORMAT(creation_date, "%s")' % sql_format, 'portal_type': None}, + portal_type=portal_type_list,limit=None, + owner=reference, + group_by=['DATE_FORMAT(creation_date, "%s")' % sql_format, 'portal_type'], + **count_kw) +""" diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/copy_of_testromain.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/copy_of_testromain.xml new file mode 100644 index 0000000000000000000000000000000000000000..65e2069916ac064017b8bea341974c4cb39f5f71 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/copy_of_testromain.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + id + copy_of_testromain + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/generateTristanDomain.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/generateTristanDomain.py new file mode 100644 index 0000000000000000000000000000000000000000..68f72f9db196a10d2f39b0d723b0182246d290ec --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/generateTristanDomain.py @@ -0,0 +1,66 @@ +domain_list = [] # [, ...] + +##### Get parents' criterions ###### + +parents_criterion_dict = {} # {"portal_type": {"identity": ["Task Report"]}), ...} +parents_membership_criterion_category_set = set() # ["follow_up/project_module/xxx", ...] + +sub_parent = parent +while depth > 0: + for criterion in sub_parent.getCriterionList(): + property_id = criterion.property + if property_id not in parents_criterion_dict: + parents_criterion_dict[property_id] = {"min": criterion.min, "max": criterion.max, "identity": criterion.identity} + sub_parent_membership_criterion_category_list = sub_parent.getMembershipCriterionCategoryList() + # sub_parent.getMultimembershipCriterionBaseCategoryList() seems to return empty list... + parents_membership_criterion_category_set.update(sub_parent_membership_criterion_category_list) + depth -= 1 + sub_parent = sub_parent.getParentValue() + +##### Define domain_list.append helper ##### + +def appendNewTempDomain(id, criterion_dict=None, membership_criterion_category_list=None, **kw): + if criterion_dict is None: + criterion_dict = parents_criterion_dict + else: + criterion_dict.update(parents_criterion_dict) + if membership_criterion_category_list is None: + membership_criterion_category_list = list(parents_membership_criterion_category_set) + else: + membership_criterion_category_list = list(parents_membership_criterion_category_set.union(membership_criterion_category_list)) + multimembership_criterion_base_category_list = list(set([c[:c.index("/")] for c in membership_criterion_category_list])) + domain = parent.generateTempDomain(id=id) + domain.edit( + criterion_property_list=criterion_dict.keys(), + multimembership_criterion_base_category_list=multimembership_criterion_base_category_list, + membership_criterion_category_list=membership_criterion_category_list, + domain_generator_method_id=script.id, + **kw + ) + for property_id, criterion_kw in criterion_dict.items(): + domain.setCriterion(property_id, **criterion_kw) + domain_list.append(domain) + +##### Provide sub domains ##### +# Don't define domain that provides criterions already used by parents + +if "delivery.start_date" not in parents_criterion_dict: + now = DateTime() + for time_frame in (1, 7, 30, 365): + appendNewTempDomain( + id="sub_time_frame_{}".format(time_frame), + title="Last {} days".format(time_frame), + criterion_dict={"delivery.start_date": {"min": now - time_frame}}, + ) + +person = context.getPortalObject().portal_membership.getAuthenticatedMember().getUserValue() +if person is not None: + category_relative_url = "source/" + person.getRelativeUrl() + if category_relative_url not in parents_membership_criterion_category_set: + appendNewTempDomain( + id="sub_assigned_to_me_1", + title="Assigned to me", + membership_criterion_category_list=(category_relative_url,), + ) + +return domain_list diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/generateTristanDomain.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/generateTristanDomain.xml new file mode 100644 index 0000000000000000000000000000000000000000..ca367ca5e6702187407943084c572a49e5e25581 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/generateTristanDomain.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + parent, depth + + + id + generateTristanDomain + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/getObjectByOid.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/getObjectByOid.xml new file mode 100644 index 0000000000000000000000000000000000000000..12d244e82564717eaebd38e270f23feeb0831206 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/getObjectByOid.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _function + getObjectByOid + + + _module + test_kaz + + + id + getObjectByOid + + + title + + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/printObjectByOid.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/printObjectByOid.py new file mode 100644 index 0000000000000000000000000000000000000000..564f02ad2963fb53a8e72eb8efe93f1a179eb69e --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/printObjectByOid.py @@ -0,0 +1,8 @@ +# you can pass oid like "?oid=0x123456" + +if oid.startswith('0x'): + oid = ('\x00'*8 + oid[2:].decode('hex'))[-8:] + +ob = context.getObjectByOid(oid) +print repr(ob)[:10*1024] +return printed diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/printObjectByOid.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/printObjectByOid.xml new file mode 100644 index 0000000000000000000000000000000000000000..d958fb31e1ee1f80172e76ffcbe4b38eab0fc1eb --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/printObjectByOid.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + oid + + + id + printObjectByOid + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testrc.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testrc.xml new file mode 100644 index 0000000000000000000000000000000000000000..d59a4d39edfe5efdad0ddbab2e6c47244deedb73 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testrc.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _function + testrc + + + _module + testrc + + + id + testrc + + + title + testrc + + + + + diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testromain.py b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testromain.py new file mode 100644 index 0000000000000000000000000000000000000000..13310408bdc1e2fea2ee59102ec48376b91b5607 --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testromain.py @@ -0,0 +1,364 @@ +result = ''# '---
' +i = 0 +for brain in context.getPortalObject().portal_catalog(portal_type='Action Information', sort_on=[['relative_url', 'ASC']]): + action = brain.getObject() + action_type = action.getActionType() + if not action.isVisible(): + continue + if ('Template' in action.getParentTitle()): + continue + if (action_type in ['object_button']): + continue + # if (action_type in ['object_report', 'object_exchange']): + # continue + if ('web' in action_type) or ('jio' in action_type) or (action_type in ['object_view', 'object_list', 'object_sort', 'object_ui', 'object_search']): + continue + + i += 1 + result += '%s %s %s %s' % (action.getParentTitle(), '%s' % (action.getRelativeUrl(), action.getTitle()), action.getActionType(), '
') + +result = '--- %i
%s' % (i, result) +print result +return printed + + +return context.getPortalObject().portal_catalog(source_project_title='1234', src__=1) + +return context.getPortalObject().portal_catalog(source_project_uid='1234', src__=1) + + + +parameter_list = field.getTemplateField().get_value('default_params') + +# Some document subobjects have a workflow, and so, can be only be deleted from some state +# If the listbox does not display them, do not add the state filter parameter +filter_portal_type_list = [x[1] for x in parameter_list if x[0] == 'portal_type'] +if filter_portal_type_list: + if sametype(filter_portal_type_list, ''): + filter_portal_type_list = [filter_portal_type_list] +else: + filter_portal_type_list = None + +return parameter_list + context.Module_listWorkflowTransitionItemList(filter_portal_type_list=filter_portal_type_list) + + + + + + + + + +# check selection content +portal = context.getPortalObject() +print '---' +for selection_id in ('bar_selection', 'foo_selection'): + print selection_id + params = portal.portal_selections.getSelectionParamsFor(selection_id) + print '%s' % str(params) + print portal.portal_selections.getSelectionColumns(selection_id) + +print 'ok' +return printed + +# delete all persons +context.portal_catalog.searchAndActivate( + portal_type='Person', + parent_uid=context.getUid(), + method_id='Couscous_deleteIfExpectedId' +) +return 'ok' + + +context.getPortalObject().notebook_module.olapy_notebook.edit(title="olapy_notebook.jsmd", reference="olapy_notebook.jsmd") +return "ok" + +import time +time.sleep(360) +return 'cosucous' + + +portal_object = portal = context.getPortalObject() +module = portal.person_module + +i = 0 +while i < 80000: + module.newContent(portal_type='Person', title='test %i' % i) + i += 1 + +return 'couscous' + + +return 'ok' + +from DateTime import DateTime +portal = context.getPortalObject() + +token = portal.access_token_module.newContent( + id='%s-%s' % (DateTime().strftime('%Y%m%d'), portal.Base_generateAccessTokenHalID()), + portal_type='HAL Access Token', + agent='person_module/160295' +) +token.validate() +return token.getRelativeUrl() + + + + + + + +from DateTime import DateTime +i = 0 +while i < 700: + context.newContent( + portal_type='Test Result Line', + string_index=i, + title=i, + start_date=DateTime(), + duration=i, + all_tests=i, + errors=1, + failures=2, + skip=3, + ) + i += 1 +return 'ok' + + + + + +context.portal_catalog.searchAndActivate( + portal_type='Person', + parent_uid=context.getUid(), + method_id='testromain2' +) +return 'ok' + + + + + + + + +context.portal_catalog.searchAndActivate( + portal_type='Person', + parent_uid=context.getUid(), + method_id='testromain2' +) +return 'ok' + + + +return 'ok' + + + + +# python: here.Module_listWorkflowTransitionItemList()['form_id_dict'].get(request.get("field_your_mass_workflow_action", ""), '') + +result = None +form_id_dict = context.Module_listWorkflowTransitionItemList()['form_id_dict'] + +# During rendering, this variable has been set into the request +# Render what user selected +action = request.get("mass_workflow_action", "") +if action: + return form_id_dict.get(action, '') + +# Validate only if user didn't change the possible action +action = request.get("field_your_mass_workflow_action", "") +if (action and action == request.get("field_your_previous_mass_workflow_action", "")): + return form_id_dict.get(action, '') + +return '' + +portal_object = portal = context.getPortalObject() +module = portal.foo_module + +i = 0 +while i < 80000: + module.newContent(portal_type='Foo', title='test %i' % i) + i += 1 + +return 'couscous' + + +raise NotImplementedError(context.REQUEST) + +return '%s %s %s %s' % (portal.portal_url(), portal.absolute_url(), portal.absolute_url_path(), context.REQUEST.physicalPathToURL(portal.getPhysicalPath() + ("",))) + + +return portal_object.portal_preferences.getPreference('preferred_foo_use', None) + +domain_tool = portal_object.portal_domains +base_domain = domain_tool.foo_domain +url_domain = portal_object.portal_url + +def generateRecur(domain, depth, result_list): + if depth: + result_list.append(('/'.join(url_domain.getRelativeContentPath(domain)[2:]), domain.getTitle())) + new_depth = depth + 1 + for sub_domain in domain_tool.getChildDomainValueList(domain, depth=depth): + generateRecur(sub_domain, new_depth, result_list) + +value_list = [] +generateRecur(base_domain, 0, value_list) +print value_list + +value_list = [] +print value_list + +return printed + + +def getDomainSelection(domain_list): + root_dict = {} + + if len(domain_list) > 0: + category_tool = portal.portal_categories + domain_tool = portal.portal_domains + preference_tool = portal.portal_preferences + + for base_domain_id in domain_list: + domain = None + if category_tool is not None: + domain = category_tool.restrictedTraverse(base_domain_id, None) + if domain is not None : + + root_dict[base_domain_id] = getattr( + domain, + preference_tool.getPreference( + 'preferred_category_child_item_list_method_id', + 'getCategoryChildCompactLogicalPathItemList' + ) + )(local_sort_id=('int_index', 'translated_title'), checked_permission='View', + filter_node=0, display_none_category=0) + + elif domain_tool is not None: + try: + domain = domain_tool.getDomainByPath(base_domain_id, None) + except KeyError: + domain = None + if domain is not None: + # XXX Implement recursive fetch + root_dict[base_domain_id] = [(x.getTitle(), x.getId()) for x in domain_tool.getChildDomainValueList(domain, depth=0)] + + return root_dict + + + +return getDomainSelection(['foo_domain']) + + + + + + + + + + + + + +return portal_object.portal_catalog(selection_domain={'region': 'france'}, src__=1) + +return portal_object.portal_catalog(selection_domain={'region': portal_object.portal_categories.region.france}, src__=1) + +domain = portal_object.portal_domains.getDomainByPath('validated_project_domain') +sql_catalog = portal_object.portal_catalog.getSQLCatalog() + +return portal_object.portal_catalog(src__=1, full_text='title:"nutnut" AND validated_project_domain:"sub1" AND selection_domain:"region:france"') + +query_kw = dict(selection_domain={ + 'validated_project_domain': domain.getChildDomainValueList(domain, depth=0)[0], + 'region': portal_object.portal_categories.region.france + }) + +return sql_catalog.buildQuery(query_kw).asSearchTextExpression(sql_catalog) +return portal_object.portal_catalog(src__=1, **query_kw) + +return portal_object.portal_catalog(selection_domain={'region': portal_object.portal_categories.region.france}, src__=1) + + + +from Products.ERP5Form.Selection import Selection, DomainSelection + +def getDomainSelection(self, domain_list): + """Return a DomainSelection object wrapped with the context. + """ + portal_object = self.getPortalObject() + root_dict = {} + + if len(domain_list) > 0: + category_tool = portal_object.portal_categories + domain_tool = portal_object.portal_domains + preference_tool = portal_object.portal_preferences + + for domain in domain_list: + + root = None + base_domain = domain.split('/', 1)[0] + if category_tool is not None: + root = category_tool.restrictedTraverse(domain, None) + if root is not None : + + root_dict[base_domain] = getattr( + root, + preference_tool.getPreference( + 'preferred_category_child_item_list_method_id', + 'getCategoryChildCompactLogicalPathItemList' + ) + )(local_sort_id=('int_index', 'translated_title'), checked_permission='View', + filter_node=0, display_none_category=0) + + elif domain_tool is not None: + try: + root = domain_tool.getDomainByPath(domain, None) + except KeyError: + root = None + if root is not None: + root_dict[base_domain] = [(x.getTitle(), x.getId()) for x in root.getChildDomainValueList(root, depth=0)] + if root is None: + root = portal_object.restrictedTraverse(domain, None) + if root is not None: + root_dict[None] = (None, domain) + + return root_dict + # return DomainSelection(domain_dict = root_dict)#.__of__(self.getContext()) + +return getDomainSelection(context, ['parent', 'region', 'validated_project_domain', 'preferred_group_person_list_domain', 'ledger'])#.asDomainItemDict(portal=context.getPortalObject()) + + +return context.getPortalObject().TaskModule_viewTaskList.listbox.getDomainSelection() + + +# from Products.ERP5Form.Tool.SelectionTool import makeTreeList +# return makeTreeList() + +# return context.getPortalObject().portal_selections. + +return context.getPortalObject().portal_catalog(selection_domain={'group': context}, src__=1) + +return "couscous" + +context.setContentType(None) +context.edit(content_type=None) +# delete content.content_type +return "ok" +# Example code: + +# Import a standard function, and get the HTML request and response objects. +from Products.PythonScripts.standard import html_quote +request = container.REQUEST +response = request.response + +# Return a string identifying this script. +print "This is the", script.meta_type, '"%s"' % script.getId(), +if script.title: + print "(%s)" % html_quote(script.title), +print "in", container.absolute_url() +return printed diff --git a/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testromain.xml b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testromain.xml new file mode 100644 index 0000000000000000000000000000000000000000..f972144d10dc554684d50d21abdf56569320796a --- /dev/null +++ b/bt5/romain_dev/SkinTemplateItem/portal_skins/romain_dev/testromain.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + + + + id + testromain + + + + + diff --git a/bt5/romain_dev/bt/dependency_list b/bt5/romain_dev/bt/dependency_list new file mode 100644 index 0000000000000000000000000000000000000000..ba32389b99e16c6febc53354c76bbbd1c0bd832a --- /dev/null +++ b/bt5/romain_dev/bt/dependency_list @@ -0,0 +1,2 @@ +erp5_web_renderjs_ui +erp5_upgrader \ No newline at end of file diff --git a/bt5/romain_dev/bt/template_extension_id_list b/bt5/romain_dev/bt/template_extension_id_list new file mode 100644 index 0000000000000000000000000000000000000000..532fedd8cd7ba0dfa3ecfefb7db054d6470d5272 --- /dev/null +++ b/bt5/romain_dev/bt/template_extension_id_list @@ -0,0 +1,2 @@ +extension.erp5.test_kaz +extension.erp5.testrc \ No newline at end of file diff --git a/bt5/erp5_officejs/bt/skip_coding_style_test b/bt5/romain_dev/bt/template_format_version similarity index 100% rename from bt5/erp5_officejs/bt/skip_coding_style_test rename to bt5/romain_dev/bt/template_format_version diff --git a/bt5/romain_dev/bt/template_keep_last_workflow_history_only_path_list b/bt5/romain_dev/bt/template_keep_last_workflow_history_only_path_list new file mode 100644 index 0000000000000000000000000000000000000000..d6215f74bdd1fb788ff479ac64f63390b3be4614 --- /dev/null +++ b/bt5/romain_dev/bt/template_keep_last_workflow_history_only_path_list @@ -0,0 +1 @@ +image_module/romain_wallpaper_* \ No newline at end of file diff --git a/bt5/romain_dev/bt/template_keep_workflow_path_list b/bt5/romain_dev/bt/template_keep_workflow_path_list new file mode 100644 index 0000000000000000000000000000000000000000..d6215f74bdd1fb788ff479ac64f63390b3be4614 --- /dev/null +++ b/bt5/romain_dev/bt/template_keep_workflow_path_list @@ -0,0 +1 @@ +image_module/romain_wallpaper_* \ No newline at end of file diff --git a/bt5/romain_dev/bt/template_path_list b/bt5/romain_dev/bt/template_path_list new file mode 100644 index 0000000000000000000000000000000000000000..d6215f74bdd1fb788ff479ac64f63390b3be4614 --- /dev/null +++ b/bt5/romain_dev/bt/template_path_list @@ -0,0 +1 @@ +image_module/romain_wallpaper_* \ No newline at end of file diff --git a/bt5/romain_dev/bt/template_skin_id_list b/bt5/romain_dev/bt/template_skin_id_list new file mode 100644 index 0000000000000000000000000000000000000000..099e3c19fe652380535dd037cc2ccaf9cd4a5e6c --- /dev/null +++ b/bt5/romain_dev/bt/template_skin_id_list @@ -0,0 +1 @@ +romain_dev \ No newline at end of file diff --git a/bt5/romain_dev/bt/title b/bt5/romain_dev/bt/title new file mode 100644 index 0000000000000000000000000000000000000000..099e3c19fe652380535dd037cc2ccaf9cd4a5e6c --- /dev/null +++ b/bt5/romain_dev/bt/title @@ -0,0 +1 @@ +romain_dev \ No newline at end of file diff --git a/bt5/romain_dev/bt/version b/bt5/romain_dev/bt/version new file mode 100644 index 0000000000000000000000000000000000000000..ceab6e11ece0bcec917c12e11d350946f085d549 --- /dev/null +++ b/bt5/romain_dev/bt/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/product/ERP5/Tool/TaskDistributionTool.py b/product/ERP5/Tool/TaskDistributionTool.py index b43e36d1aaa915fbde0df6fab67be628767ade52..9469616e851a85d702bdbc355ae32fd1c91da996 100644 --- a/product/ERP5/Tool/TaskDistributionTool.py +++ b/product/ERP5/Tool/TaskDistributionTool.py @@ -231,18 +231,26 @@ class TaskDistributionTool(BaseTool): if test_result.getSimulationState() != 'started': return started_list = [] - for line in test_result.objectValues(portal_type="Test Result Line", - sort_on=[("int_index","ascending")]): + + # Look for a test to run + # As many nodes may call this function at the same time, + # fetching all lines will create read/write DB conflicts + # To prevent this, randomize the list of documents to check + # and stop as soon as one test to run is found + line_id_list = [x for x in test_result.objectIds()] + random.shuffle(line_id_list) + for line_id in line_id_list: + line = test_result[line_id] + if (line.getPortalType() != 'Test Result Line'): + continue test = line.getTitle() if test not in exclude_list: - state = line.getSimulationState() - test = line.getRelativeUrl(), test - if state == 'draft': + if line.getSimulationState() == 'draft': if node_title: node = self._getTestNodeRelativeUrl(node_title) line.setSource(node) line.start() - return test + return line.getRelativeUrl(), test security.declarePublic('stopUnitTest') def stopUnitTest(self, test_path, status_dict, node_title=None): diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document%20Component/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document%20Component/view.xml index d1ef3945fa661c81207731dacade02711451be3e..01070ae24f317c9f9f761a23353a4791995fb14d 100644 --- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document%20Component/view.xml +++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Document%20Component/view.xml @@ -26,9 +26,7 @@ condition - - AAAAAAAAAAM= - + description @@ -80,17 +78,4 @@ - - - - - - - - text - python: object is not None and not object.isWebMode() - - - - diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Extension%20Component/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Extension%20Component/view.xml index d1ef3945fa661c81207731dacade02711451be3e..046e2d9e57d526f0c52fe6fd0542cda767d5d376 100644 --- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Extension%20Component/view.xml +++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Extension%20Component/view.xml @@ -26,15 +26,11 @@ condition - - AAAAAAAAAAM= - + description - - - + python: object is not None and not object.isWebMode() icon @@ -80,17 +76,4 @@ - - - - - - - - text - python: object is not None and not object.isWebMode() - - - - diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Test%20Component/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Test%20Component/view.xml index d1ef3945fa661c81207731dacade02711451be3e..01070ae24f317c9f9f761a23353a4791995fb14d 100644 --- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Test%20Component/view.xml +++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Test%20Component/view.xml @@ -26,9 +26,7 @@ condition - - AAAAAAAAAAM= - + description @@ -80,17 +78,4 @@ - - - - - - - - text - python: object is not None and not object.isWebMode() - - - - diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ComponentMixin_view/my_text_content.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ComponentMixin_view/my_text_content.xml index 605e4afe9541067f1d6f0b6caccc8540af35b38d..86b416111236273b219b31cc110057be0e526ccd 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ComponentMixin_view/my_text_content.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ComponentMixin_view/my_text_content.xml @@ -2,10 +2,18 @@ - + + + delegated_list + + + title + + + id my_text_content @@ -18,22 +26,6 @@ external_validator_failed The input failed the external validator. - - 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. - @@ -42,79 +34,11 @@ - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - text_editor + field_id - title - - - - unicode - - - - whitespace_preserve - - - - width + form_id @@ -125,83 +49,11 @@ - alternate_name - - - - css_class - - - - default - - AAAAAAAAAAI= - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - text_editor - - AAAAAAAAAAM= - - - - title + field_id - unicode - - - - whitespace_preserve - - - - width + form_id @@ -212,111 +64,21 @@ - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - style="width: 100%" - - - height - 20 - - - hidden - 0 - - - max_length - - - - max_linelength - - - - max_lines - + field_id + my_view_mode_text_content - required - 0 - - - text_editor - text_area + form_id + Base_viewFieldLibrary title Source Code - - unicode - 0 - - - whitespace_preserve - 1 - - - width - 60 - - - - - - - - - _text - python: here.getTextContent() - - - - - - - - - - - - _text - python: here.portal_preferences.getPreferredSourceCodeEditor() - - - - diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js index 141ee216db4ea98a58ed45fe344b6b8f6adb87d5..1bfed94ca91c08d173fb49d07a86d9b4d0e6b7cb 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_global.js.js @@ -101,7 +101,7 @@ try { result = callback(evt); } catch (e) { - return reject(e); + result = reject(e); } callback_promise = new RSVP.Queue(result).push(undefined, reject); diff --git a/product/ERP5/tests/testXHTML.py b/product/ERP5/tests/testXHTML.py index 62ab076f915c86753efd303c45c1c9c9a2f4444e..f9dd8be403449ac20de26cc33291344a1f7a5cb1 100644 --- a/product/ERP5/tests/testXHTML.py +++ b/product/ERP5/tests/testXHTML.py @@ -140,7 +140,10 @@ class TestXHTMLMixin(ERP5TypeTestCase): for field_path, field in skins_tool[skin_folder_id].ZopeFind( skins_tool[skin_folder_id], obj_metatypes=['ProxyField'], search_sub=1): - template_field = field.getTemplateField(cache=False) + try: + template_field = field.getTemplateField(cache=False) + except AttributeError: + template_field = None if template_field is None: # Base_viewRelatedObjectList (used for proxy listbox ids on # relation fields) is an exception, the proxy field has no target diff --git a/product/ERP5Form/GadgetField.py b/product/ERP5Form/GadgetField.py index 90462784c3b55542ad23985017c273b536f75eb6..63019addf0a4e87135b9de1bc762fef46335cdbb 100644 --- a/product/ERP5Form/GadgetField.py +++ b/product/ERP5Form/GadgetField.py @@ -41,11 +41,14 @@ class GadgetWidget(Widget.Widget): return self.render_view(field, value, REQUEST, render_prefix, key) def render_view(self, field, value, REQUEST=None, render_prefix=None, key=None): + gadget_url = field.get_value('gadget_url') + gadget_component = field.restrictedTraverse(gadget_url, None) + if gadget_component is not None: + gadget_url = gadget_component.absolute_url() kw = { 'data-gadget-sandbox': field.get_value('js_sandbox'), # Duplicate the absolute url logic of xhtml style - 'data-gadget-url': urljoin(field.getPortalObject().absolute_url() + '/', - field.get_value('gadget_url')), + 'data-gadget-url': gadget_url, 'data-gadget-value': value, 'data-gadget-renderjs-extra': dumps(dict(field.get_value('renderjs_extra'))) } diff --git a/product/ERP5Type/mixin/component.py b/product/ERP5Type/mixin/component.py index 225bfd54b8d54daebc0bc9110666b2b125f23b85..8e2d50affa7033cfce92d50c7a72c8e774147604 100644 --- a/product/ERP5Type/mixin/component.py +++ b/product/ERP5Type/mixin/component.py @@ -309,7 +309,7 @@ class ComponentMixin(PropertyRecordableMixin, Base): Check Component source code through Pylint or compile() builtin if not available """ - return checkPythonSourceCode(self.getTextContent(), self.getPortalType()) + return [] security.declareProtected(Permissions.ModifyPortalContent, 'PUT') def PUT(self, REQUEST, RESPONSE): diff --git a/tests/__init__.py b/tests/__init__.py index cfbd61061a071ddcb2aefbafdcb5b343f18788fb..312b27b26a2b12b8e18b9c3a9d8b215a40b28400 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -35,9 +35,8 @@ class _ERP5(ERP5TypeTestSuite): component_re = re.compile(".*/([^/]+)/TestTemplateItem/portal_components" "/test\.[^.]+\.([^.]+).py$") for test_path in ( - glob('%s/product/*/tests/test*.py' % path) + - glob('%s/bt5/*/TestTemplateItem/test*.py' % path) + - glob('%s/bt5/*/TestTemplateItem/portal_components/test.*.test*.py' % path)): + glob('%s/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + [] + ): component_re_match = component_re.match(test_path) if component_re_match is not None: test_case = "%s:%s" % (component_re_match.group(1),