From 3b5159224e1df94f1b79affad5459787da1a6d7f Mon Sep 17 00:00:00 2001 From: Boxiang Sun <boxiang.sun@nexedi.com> Date: Wed, 30 Aug 2017 09:24:06 +0000 Subject: [PATCH] Revert! erp5_officejs_support_request_ui: fix ckeditor gadget url. Commit 929ac90a99bf2d119aef901bec0b4b214bba1b2a and 0de0acb31124e613521b984b12b488a4d0eaa04d use the text editor from `app.officejs.com`. Which is not same domain as the main application. When Selenium tests run with Firefox. If Firefox visit a page which contains an iframe from another domain, it is unable to redirect to another link and complaints `Permission denied to access property "href"`. In order to make the test get pass on the server with FIrefox. Revert the changes the that two commits which described above. --- .../rjs_gadget_erp5_pt_form_view_discussable_js.js | 2 +- .../rjs_gadget_erp5_pt_form_view_discussable_js.xml | 4 ++-- .../web_site_module/erp5_officejs_support_request_ui.xml | 6 +++--- .../my_description.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.js b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.js index 3b48bfa00c..7357333647 100644 --- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.js +++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.js @@ -185,7 +185,7 @@ }) .declareService(function () { var gadget = this; - return gadget.declareGadget("https://texteditor.app.officejs.com/d8f869616f/officejs_ckeditor_gadget/app/", + return gadget.declareGadget("officejs_ckeditor_gadget/development/", { element: gadget.element.querySelector('.editor'), sandbox: 'iframe', diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.xml index d36fe40d6e..840cfd5995 100644 --- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.xml +++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_discussable_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>960.51741.36262.5120</string> </value> + <value> <string>961.46663.24395.45414</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1500301509.14</float> + <float>1504082428.41</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_site_module/erp5_officejs_support_request_ui.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_site_module/erp5_officejs_support_request_ui.xml index 6ceeb23223..208bb31809 100644 --- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_site_module/erp5_officejs_support_request_ui.xml +++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_site_module/erp5_officejs_support_request_ui.xml @@ -321,7 +321,7 @@ </item> <item> <key> <string>configuration_content_security_policy</string> </key> - <value> <string>default-src \'self\'; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' data:; script-src \'self\' \'unsafe-eval\'; font-src \'self\'; style-src \'self\' data:; frame-src \'self\' *.app.officejs.com data:</string> </value> + <value> <string>default-src \'self\'; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' data:; script-src \'self\' \'unsafe-eval\'; font-src \'self\'; style-src \'self\' data:; frame-src \'self\' data:</string> </value> </item> <item> <key> <string>configuration_default_view_action_reference</string> </key> @@ -592,7 +592,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>961.9326.59090.45687</string> </value> + <value> <string>961.46664.19323.17902</string> </value> </item> <item> <key> <string>state</string> </key> @@ -610,7 +610,7 @@ </tuple> <state> <tuple> - <float>1503561733.43</float> + <float>1504082669.35</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_viewSupportRequestFastInputDialog/my_description.xml b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_viewSupportRequestFastInputDialog/my_description.xml index b81fdf7a7b..9f36956072 100644 --- a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_viewSupportRequestFastInputDialog/my_description.xml +++ b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_viewSupportRequestFastInputDialog/my_description.xml @@ -134,7 +134,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>string: https://texteditor.app.officejs.com/d8f869616f/officejs_ckeditor_gadget/app/</string> </value> + <value> <string>python: field.restrictedTraverse("officejs_ckeditor_gadget/development").absolute_url() + "/"</string> </value> </item> </dictionary> </pickle> -- 2.30.9