From fdfb2ca1811fa8b717a5ebd0c0e6d6d70a125884 Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Tue, 3 Jul 2018 14:19:00 +0000 Subject: [PATCH 01/12] Changed the local storage option to now use 'historyStorage'. --- .../gadget_officejs_page_jio_configurator_js.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js index 6eac842dbd0..2375d1fac32 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js @@ -23,12 +23,15 @@ "local": { "setConfiguration": function (gadget) { var configuration = { - type: "query", + type: "uuid", sub_storage: { - type: "uuid", + type: "history", sub_storage: { - type: "indexeddb", - database: "local_default" + type: "query", + sub_storage: { + type: "indexeddb", + database: "local_default" + } } } }; -- 2.30.9 From feb4ec5299180fa8b68596fed98675667b66e19a Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Wed, 4 Jul 2018 15:24:53 +0000 Subject: [PATCH 02/12] Changed init file to only run certain tests. --- tests/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index b2b4b116e4c..a3310a5d1fc 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -35,9 +35,12 @@ 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_hal_json_style/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_crm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_accounting_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_web_renderjs_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), -- 2.30.9 From a1fc6c2b12462be60639aa9ce5c86fcab4be270f Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Wed, 4 Jul 2018 16:04:19 +0000 Subject: [PATCH 03/12] Added historystorage as local storage option --- .../gadget_officejs_page_jio_configurator_js.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js index 2375d1fac32..6eac842dbd0 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js @@ -23,15 +23,12 @@ "local": { "setConfiguration": function (gadget) { var configuration = { - type: "uuid", + type: "query", sub_storage: { - type: "history", + type: "uuid", sub_storage: { - type: "query", - sub_storage: { - type: "indexeddb", - database: "local_default" - } + type: "indexeddb", + database: "local_default" } } }; -- 2.30.9 From ed1373a8f65563f25fe2946c265b5dd22a6b385e Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Thu, 5 Jul 2018 10:17:10 +0000 Subject: [PATCH 04/12] Re-added history storage to configuration file. --- .../gadget_officejs_page_jio_configurator_js.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js index 6eac842dbd0..2375d1fac32 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js @@ -23,12 +23,15 @@ "local": { "setConfiguration": function (gadget) { var configuration = { - type: "query", + type: "uuid", sub_storage: { - type: "uuid", + type: "history", sub_storage: { - type: "indexeddb", - database: "local_default" + type: "query", + sub_storage: { + type: "indexeddb", + database: "local_default" + } } } }; -- 2.30.9 From 3c69ae37b43a334464262de379282e9e64cefca9 Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Fri, 6 Jul 2018 10:12:23 +0000 Subject: [PATCH 05/12] Added querystorage on top of historystorage in configurator file. --- .../gadget_officejs_page_jio_configurator_js.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js index 2375d1fac32..ead9c6d54af 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.js @@ -25,12 +25,15 @@ var configuration = { type: "uuid", sub_storage: { - type: "history", + type: "query", sub_storage: { - type: "query", + type: "history", sub_storage: { - type: "indexeddb", - database: "local_default" + type: "query", + sub_storage: { + type: "indexeddb", + database: "local_default" + } } } } -- 2.30.9 From 6238928724853ba10cba4b2bf3dfe4227b7b3f08 Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Fri, 6 Jul 2018 10:22:49 +0000 Subject: [PATCH 06/12] Reduced number of tests to run. --- tests/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index a3310a5d1fc..a57469a9e35 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -35,12 +35,8 @@ class _ERP5(ERP5TypeTestSuite): component_re = re.compile(".*/([^/]+)/TestTemplateItem/portal_components" "/test\.[^.]+\.([^.]+).py$") for test_path in ( - glob('%s/bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.*.test*.py' % path) + - # glob('%s/bt5/erp5_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_crm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_accounting_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - # glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path)): + glob('%s/bt5/erp5_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_officejs_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), -- 2.30.9 From e1620dacb4fcb1bd34c401cfee91e4d292109b2d Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Tue, 17 Jul 2018 09:48:44 +0000 Subject: [PATCH 07/12] Added see_history gadget to display listbox of revisions of all documents in text editor app --- ...get_officejs_erp5_page_document_list_js.js | 6 +- ...t_officejs_erp5_page_see_history_html.html | 19 +++ ...adget_officejs_erp5_page_see_history_js.js | 146 ++++++++++++++++++ 3 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.html create mode 100644 bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js index 5e8f568a338..c4f080c74b0 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js @@ -124,14 +124,16 @@ .push(function () { return RSVP.all([ gadget.getUrlFor({command: "change", options: {"page": "ojs_add_document"}}), - gadget.getSetting('document_title_plural') + gadget.getSetting('document_title_plural'), + gadget.getUrlFor({command: "change", options: {"page": "ojs_see_history"}}) ]); }) .push(function (result) { return gadget.updateHeader({ page_title: result[1], filter_action: true, - add_url: result[0] + add_url: result[0], + see_history: result[2] }); }); }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.html b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.html new file mode 100644 index 00000000000..097b7affd82 --- /dev/null +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.html @@ -0,0 +1,19 @@ + + + + + + + + OfficeJS See History Page + + + + + + + + +
+ + \ No newline at end of file diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js new file mode 100644 index 00000000000..b8781f23da9 --- /dev/null +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js @@ -0,0 +1,146 @@ +/*global window, rJS, RSVP */ +/*jslint nomen: true, indent: 2, maxerr: 3 */ +(function (window, rJS, RSVP) { + "use strict"; + + rJS(window) + ///////////////////////////////////////////////////////////////// + // Acquired methods + ///////////////////////////////////////////////////////////////// + .declareAcquiredMethod("updateHeader", "updateHeader") + .declareAcquiredMethod("getUrlParameter", "getUrlParameter") + .declareAcquiredMethod("getUrlFor", "getUrlFor") + .declareAcquiredMethod("jio_allDocs", "jio_allDocs") + .declareAcquiredMethod("getSetting", "getSetting") + .declareAcquiredMethod("jio_toggleRevisionOption", + "jio_toggleRevisionOption") + + ///////////////////////////////////////////////////////////////// + // declared methods + ///////////////////////////////////////////////////////////////// + .allowPublicAcquisition("jio_allDocs", function (param_list) { + var gadget = this; + return gadget.jio_toggleRevisionOption() + .push(function () { + return gadget.jio_allDocs(param_list[0]) + .push(function (result) { + var i, date, len = result.data.total_rows; + for (i = 0; i < len; i += 1) { + if (result.data.rows[i].value.hasOwnProperty("modification_date")) { + date = new Date(result.data.rows[i].value.modification_date); + result.data.rows[i].value.modification_date = { + field_gadget_param: { + allow_empty_time: 0, + ampm_time_style: 0, + css_class: "date_field", + date_only: 0, + description: "The Date", + editable: 0, + hidden: 0, + hidden_day_is_last_day: 0, + "default": date.toUTCString(), + key: "modification_date", + required: 0, + timezone_style: 0, + title: "Modification Date", + type: "DateTimeField" + } + }; + result.data.rows[i].value["listbox_uid:list"] = { + key: "listbox_uid:list", + value: 2713 + }; + } + } + return gadget.jio_toggleRevisionOption() + .push(function () { + return result; + }); + }); + }); + }) + .allowPublicAcquisition('notifySubmit', function () { + return this.triggerSubmit(); + }) + + .declareMethod("triggerSubmit", function () { + var argument_list = arguments; + return this.getDeclaredGadget('form_list') + .push(function (gadget) { + return gadget.triggerSubmit.apply(gadget, argument_list); + }); + }) + + .declareMethod("render", function () { + var gadget = this; + + return new RSVP.Queue() + .push(function () { + return RSVP.all([ + gadget.getDeclaredGadget('form_list'), + gadget.getSetting("portal_type") + ]); + }) + .push(function (result) { + var column_list = [ + ['title', 'Title'], + ['reference', 'Reference'], + ['language', 'Language'], + ['description', 'Description'], + ['version', 'Version'], + ['modification_date', 'Modification Date'] + ]; + return result[0].render({ + erp5_document: { + "_embedded": {"_view": { + "listbox": { + "column_list": column_list, + "show_anchor": 0, + "default_params": {}, + "editable": 1, + "editable_column_list": [], + "key": "field_listbox", + "lines": 30, + "list_method": "portal_catalog", + "query": "urn:jio:allDocs?query=portal_type%3A%22" + + result[1] + "%22", + "portal_type": [], + "search_column_list": column_list, + "sort_column_list": column_list, + "sort": [['modification_date', 'descending']], + "title": "Documents", + "type": "ListBox" + } + }}, + "_links": { + "type": { + // form_list display portal_type in header + name: "" + } + } + }, + form_definition: { + group_list: [[ + "bottom", + [["listbox"]] + ]] + } + }); + }) + .push(function () { + return RSVP.all([ + gadget.getUrlFor({command: "change", options: {"page": "ojs_add_document"}}), + gadget.getSetting('document_title_plural'), + gadget.getUrlFor({command: "change", options: {"page": "ojs_document_list"}}) + ]); + }) + .push(function (result) { + return gadget.updateHeader({ + page_title: result[1], + filter_action: true, + add_url: result[0], + doc_list: result[2] + }); + }); + }); +}(window, rJS, RSVP)); \ No newline at end of file -- 2.30.9 From 096fb5d1d14beb8706d17a2901ad0da753fcd510 Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Tue, 24 Jul 2018 14:35:07 +0000 Subject: [PATCH 08/12] Updated officejs text editor to include history button. --- ..._officejs_controller_page_controller_js.js | 3 +- ...officejs_controller_page_controller_js.xml | 4 +- ...get_officejs_erp5_page_document_list_js.js | 5 +- ...et_officejs_erp5_page_document_list_js.xml | 6 +- ...et_officejs_erp5_page_see_history_html.xml | 362 ++++++++++++++++++ ...adget_officejs_erp5_page_see_history_js.js | 71 ++-- ...dget_officejs_erp5_page_see_history_js.xml | 358 +++++++++++++++++ .../gadget_officejs_page_document_list_js.js | 5 +- .../gadget_officejs_page_document_list_js.xml | 4 +- ...dget_officejs_page_jio_configurator_js.xml | 4 +- .../ojs_page_drive_app_configurator_js.xml | 6 +- 11 files changed, 775 insertions(+), 53 deletions(-) create mode 100644 bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml create mode 100644 bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js index b8cf6ee6100..dff215ee702 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js @@ -41,7 +41,6 @@ .declareMethod("render", function (options) { var gadget = this, child_gadget_url; - return gadget.jio_get(options.jio_key) .push(function (result) { @@ -88,4 +87,4 @@ }); }); -}(document, window, rJS)); \ No newline at end of file +}(document, window, rJS)); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml index 894deee9c59..9066f4d7e73 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml @@ -227,7 +227,7 @@ serial - 967.6016.61211.59613 + 968.63092.49502.60160 state @@ -245,7 +245,7 @@ - 1524754712.51 + 1531834849.72 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js index c4f080c74b0..5617ab97b83 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js @@ -12,6 +12,8 @@ .declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("getSetting", "getSetting") + .declareAcquiredMethod("jio_toggleRevisionOption", + "jio_toggleRevisionOption") ///////////////////////////////////////////////////////////////// // declared methods @@ -67,7 +69,6 @@ .declareMethod("render", function () { var gadget = this; - return new RSVP.Queue() .push(function () { return RSVP.all([ @@ -137,4 +138,4 @@ }); }); }); -}(window, rJS, RSVP)); \ No newline at end of file +}(window, rJS, RSVP)); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml index 3e341259301..97d2b0d2059 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml @@ -256,7 +256,7 @@ actor - vincent + zope comment @@ -270,7 +270,7 @@ serial - 966.41210.1237.18158 + 968.63158.19596.29713 state @@ -288,7 +288,7 @@ - 1523022228.16 + 1531839117.64 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml new file mode 100644 index 00000000000..67af727f986 --- /dev/null +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml @@ -0,0 +1,362 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + categories + + + contributor/person_module/1 + + + + + content_md5 + + + + + + content_type + text/html + + + creators + + + cedric.le.ninivin + + + + + default_reference + gadget_erp5_page_ojs_see_history.html + + + description + + + + + + id + gadget_officejs_erp5_page_see_history_html + + + language + + + + + + modification_date + + + + + + + + + + + 1455284351.46 + UTC + + + + + + + portal_type + Web Page + + + short_title + + + + + + title + OfficeJS See History + + + url_string + + + + + + version + 001 + + + workflow_history + + AAAAAAAAAAI= + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAM= + + + + edit_workflow + + AAAAAAAAAAQ= + + + + processing_status_workflow + + AAAAAAAAAAU= + + + + + + + + + + + + + + + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1531744100.58 + UTC + + + + + + + validation_state + published + + + + + + + + + + + + + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 968.61646.7207.32238 + + + state + current + + + time + + + + + + + + + + + 1531748492.08 + UTC + + + + + + + + + + + + + + + + + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1531478687.63 + UTC + + + + + + + + + + + diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js index b8781f23da9..48b3d316091 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js @@ -20,44 +20,43 @@ ///////////////////////////////////////////////////////////////// .allowPublicAcquisition("jio_allDocs", function (param_list) { var gadget = this; - return gadget.jio_toggleRevisionOption() + return gadget.jio_toggleRevisionOption(true) .push(function () { - return gadget.jio_allDocs(param_list[0]) - .push(function (result) { - var i, date, len = result.data.total_rows; - for (i = 0; i < len; i += 1) { - if (result.data.rows[i].value.hasOwnProperty("modification_date")) { - date = new Date(result.data.rows[i].value.modification_date); - result.data.rows[i].value.modification_date = { - field_gadget_param: { - allow_empty_time: 0, - ampm_time_style: 0, - css_class: "date_field", - date_only: 0, - description: "The Date", - editable: 0, - hidden: 0, - hidden_day_is_last_day: 0, - "default": date.toUTCString(), - key: "modification_date", - required: 0, - timezone_style: 0, - title: "Modification Date", - type: "DateTimeField" - } - }; - result.data.rows[i].value["listbox_uid:list"] = { - key: "listbox_uid:list", - value: 2713 - }; - } + return gadget.jio_allDocs(param_list[0]); + }) + .push(function (result) { + var i, date, len = result.data.total_rows; + for (i = 0; i < len; i += 1) { + if (result.data.rows[i].value.hasOwnProperty("modification_date")) { + date = new Date(result.data.rows[i].value.modification_date); + result.data.rows[i].value.modification_date = { + field_gadget_param: { + allow_empty_time: 0, + ampm_time_style: 0, + css_class: "date_field", + date_only: 0, + description: "The Date", + editable: 0, + hidden: 0, + hidden_day_is_last_day: 0, + "default": date.toUTCString(), + key: "modification_date", + required: 0, + timezone_style: 0, + title: "Modification Date", + type: "DateTimeField" + } + }; + result.data.rows[i].value["listbox_uid:list"] = { + key: "listbox_uid:list", + value: 2713 + }; } - return gadget.jio_toggleRevisionOption() - .push(function () { - return result; - }); - }); - }); + } + .push(function () { + gadget.jio_toggleRevisionOption(false); + return result; + }); }) .allowPublicAcquisition('notifySubmit', function () { return this.triggerSubmit(); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml new file mode 100644 index 00000000000..3183250115a --- /dev/null +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml @@ -0,0 +1,358 @@ + + + + + + + + + + _Access_contents_information_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + _Add_portal_content_Permission + + + Assignor + Manager + + + + + _Change_local_roles_Permission + + + Assignor + Manager + + + + + _Modify_portal_content_Permission + + + Manager + + + + + _View_Permission + + + Anonymous + Assignee + Assignor + Associate + Auditor + Manager + + + + + categories + + + contributor/person_module/1 + + + + + content_md5 + + + + + + creators + + + cedric.le.ninivin + + + + + default_reference + gadget_erp5_page_ojs_see_history.js + + + description + + + + + + id + gadget_officejs_erp5_page_see_history_js + + + language + + + + + + modification_date + + + + + + + + + + + 1455284351.49 + UTC + + + + + + + portal_type + Web Script + + + short_title + + + + + + title + OfficeJS See History JS + + + url_string + + + + + + version + 001 + + + workflow_history + + AAAAAAAAAAI= + + + + + + + + + + + + + data + + + + document_publication_workflow + + AAAAAAAAAAM= + + + + edit_workflow + + AAAAAAAAAAQ= + + + + processing_status_workflow + + AAAAAAAAAAU= + + + + + + + + + + + + + + + + + + + action + publish + + + actor + zope + + + comment + + + + error_message + + + + time + + + + + + + + + + + 1531744666.92 + UTC + + + + + + + validation_state + published + + + + + + + + + + + + + + + + + action + edit + + + actor + zope + + + comment + + + + + + error_message + + + + serial + 968.63165.50418.55142 + + + state + current + + + time + + + + + + + + + + + 1531839433.13 + UTC + + + + + + + + + + + + + + + + + + + + + action + detect_converted_file + + + actor + zope + + + comment + + + + error_message + + + + external_processing_state + converted + + + serial + 0.0.0.0 + + + time + + + + + + + + + + + 1531478632.37 + UTC + + + + + + + + + + + diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js index ec991d79add..b51a5bc19c7 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js @@ -36,8 +36,11 @@ .declareAcquiredMethod('getSetting', 'getSetting') .declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("redirect", "redirect") + .declareAcquiredMethod("jio_toggleRevisionOption", + "jio_toggleRevisionOption") .allowPublicAcquisition("jio_allDocs", function (param_list) { var gadget = this; + gadget.jio_toggleRevisionOption(false); return this.jio_allDocs.apply(this, param_list) .push(function (result) { var i, @@ -119,4 +122,4 @@ }); }); -}(window, RSVP, rJS)); \ No newline at end of file +}(window, RSVP, rJS)); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml index 01be8061d7f..d51dfd45511 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml @@ -267,7 +267,7 @@ serial - 959.44888.46554.50039 + 968.63157.4401.28006 state @@ -285,7 +285,7 @@ - 1498035961.94 + 1531838725.42 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.xml index e78be35cd92..c9934b64780 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_configurator_js.xml @@ -236,7 +236,7 @@ serial - 961.10686.10882.5973 + 968.61786.19635.10274 state @@ -254,7 +254,7 @@ - 1501771018.12 + 1531816452.69 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_page_drive_app_configurator_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_page_drive_app_configurator_js.xml index ec824ee8ee2..486a1e7f878 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_page_drive_app_configurator_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_page_drive_app_configurator_js.xml @@ -236,7 +236,7 @@ serial - 962.48398.15828.27938 + 968.44071.55411.42615 state @@ -254,8 +254,8 @@ - 1507880576.48 - GMT+9 + 1530708459.0 + UTC -- 2.30.9 From 45cec7c47cc2c376f423b15a0be2908f3a876fe1 Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Thu, 26 Jul 2018 15:17:30 +0000 Subject: [PATCH 09/12] Updated see history option. --- .../gadget_officejs_controller_page_controller_js.js | 2 +- .../gadget_officejs_controller_page_controller_js.xml | 4 ++-- .../gadget_officejs_erp5_page_document_list_js.js | 7 +++++-- .../gadget_officejs_erp5_page_document_list_js.xml | 4 ++-- .../gadget_officejs_erp5_page_see_history_js.js | 2 -- .../gadget_officejs_erp5_page_see_history_js.xml | 4 ++-- .../gadget_officejs_page_document_list_js.js | 2 +- .../gadget_officejs_page_document_list_js.xml | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js index dff215ee702..653aaa59c2d 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js @@ -87,4 +87,4 @@ }); }); -}(document, window, rJS)); +}(document, window, rJS)); \ No newline at end of file diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml index 9066f4d7e73..ae2d97b604c 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml @@ -227,7 +227,7 @@ serial - 968.63092.49502.60160 + 968.63092.54317.19490 state @@ -245,7 +245,7 @@ - 1531834849.72 + 1531928427.76 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js index 5617ab97b83..e59159ae3f4 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js @@ -21,7 +21,10 @@ .allowPublicAcquisition("jio_allDocs", function (param_list) { var gadget = this; - return gadget.jio_allDocs(param_list[0]) + return gadget.jio_toggleRevisionOption(false) + .push(function () { + return gadget.jio_allDocs(param_list[0]); + }) .push(function (result) { var i, date, len = result.data.total_rows; for (i = 0; i < len; i += 1) { @@ -138,4 +141,4 @@ }); }); }); -}(window, rJS, RSVP)); +}(window, rJS, RSVP)); \ No newline at end of file diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml index 97d2b0d2059..6b7d37b8fa8 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml @@ -270,7 +270,7 @@ serial - 968.63158.19596.29713 + 968.63193.3444.40072 state @@ -288,7 +288,7 @@ - 1531839117.64 + 1532440204.49 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js index 48b3d316091..701495988d1 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js @@ -53,8 +53,6 @@ }; } } - .push(function () { - gadget.jio_toggleRevisionOption(false); return result; }); }) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml index 3183250115a..5c360f53a47 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml @@ -268,7 +268,7 @@ serial - 968.63165.50418.55142 + 968.63202.32840.27340 state @@ -286,7 +286,7 @@ - 1531839433.13 + 1531923217.03 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js index b51a5bc19c7..15f5b339183 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js @@ -122,4 +122,4 @@ }); }); -}(window, RSVP, rJS)); +}(window, RSVP, rJS)); \ No newline at end of file diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml index d51dfd45511..8782bbecd92 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml @@ -267,7 +267,7 @@ serial - 968.63157.4401.28006 + 968.63157.27775.20480 state @@ -285,7 +285,7 @@ - 1531838725.42 + 1531928420.68 UTC -- 2.30.9 From 8b61dbf836c3f6f81d7efa4e1f4a8b8119734974 Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Mon, 30 Jul 2018 07:56:04 +0000 Subject: [PATCH 10/12] Revert "erp5.util.testbrowser: Refactor of openNoVisit() and {Image,Submit}Control for recent zope.testbrowser (followup of 5a0b376)." This reverts commit 98635b888b9e15c2beab142eed7ca238d811988e. Reverting master branch to commit before history button edits. --- erp5/util/testbrowser/browser.py | 219 +++++++++++-------------------- 1 file changed, 74 insertions(+), 145 deletions(-) diff --git a/erp5/util/testbrowser/browser.py b/erp5/util/testbrowser/browser.py index 96760699b45..fbf3a704384 100644 --- a/erp5/util/testbrowser/browser.py +++ b/erp5/util/testbrowser/browser.py @@ -36,10 +36,9 @@ import urllib import Cookie import re -from zope.testbrowser._compat import urlparse +from urlparse import urljoin from z3c.etestbrowser.browser import ExtendedTestBrowser from zope.testbrowser.browser import onlyOne -from contextlib import contextmanager def measurementMetaClass(prefix): """ @@ -202,7 +201,7 @@ class Browser(ExtendedTestBrowser): # In case url_or_path is an absolute URL, urljoin() will return # it, otherwise it is a relative path and will be concatenated to # ERP5 base URL - url_or_path = urlparse.urljoin(self._erp5_base_url, url_or_path) + url_or_path = urljoin(self._erp5_base_url, url_or_path) if isinstance(data, dict): data = urllib.urlencode(data) @@ -210,100 +209,6 @@ class Browser(ExtendedTestBrowser): self._logger.debug("Opening: " + url_or_path) super(Browser, self).open(url_or_path, data) - @contextmanager - def _preparedRequest(self, url, no_visit=False): - """ - Monkey patched for openNoVisit() - """ - from zope.testbrowser._compat import urlparse - - self.timer.start() - - headers = {} - if self.url: - headers['Referer'] = self.url - - if self._req_content_type: - headers['Content-Type'] = self._req_content_type - - headers['Connection'] = 'close' - headers['Host'] = urlparse.urlparse(url).netloc - headers['User-Agent'] = 'Python-urllib/2.4' - - headers.update(self._req_headers) - - extra_environ = {} - if self.handleErrors: - extra_environ['paste.throw_errors'] = None - headers['X-zope-handle-errors'] = 'True' - else: - extra_environ['wsgi.handleErrors'] = False - extra_environ['paste.throw_errors'] = True - extra_environ['x-wsgiorg.throw_errors'] = True - headers.pop('X-zope-handle-errors', None) - - kwargs = {'headers': sorted(headers.items()), - 'extra_environ': extra_environ, - 'expect_errors': True} - - yield kwargs - - if not no_visit: - self._changed() - - self.timer.stop() - - def _processRequest(self, url, make_request, no_visit=False): - """ - Monkey patched for openNoVisit() - """ - from zope.testbrowser.browser import REDIRECTS - from zope.testbrowser._compat import urlparse - - with self._preparedRequest(url, no_visit=no_visit) as reqargs: - if not no_visit: - self._history.add(self._response) - - resp = make_request(reqargs) - remaining_redirects = 100 # infinite loops protection - while resp.status_int in REDIRECTS and remaining_redirects: - remaining_redirects -= 1 - # BEGIN: Bugfix - location = resp.headers['location'] - if '?' in location: - location_without_query_string, query_string = location.split('?') - location = ( - location_without_query_string + - '?' + urllib.urlencode(urlparse.parse_qs(query_string, - strict_parsing=True), - doseq=True)) - # END: Bugfix - url = urlparse.urljoin(url, location) - - with self._preparedRequest(url, no_visit=no_visit) as reqargs: - resp = self.testapp.get(url, **reqargs) - assert remaining_redirects > 0, "redirects chain looks infinite" - - if not no_visit: - self._setResponse(resp) - self._checkStatus() - - return resp - - def _absoluteUrl(self, url): - absolute = url.startswith('http://') or url.startswith('https://') - if absolute: - return str(url) - - if self._response is None: - raise BrowserStateError( - "can't fetch relative reference: not viewing any document") - - if not isinstance(url, unicode): - url = url.decode('utf-8') - - return str(urlparse.urljoin(self._getBaseUrl(), url).encode('utf-8')) - def openNoVisit(self, url_or_path, data=None, site_relative=True): """ Copy/paste from zope.testbrowser.Browser.open() to allow opening an URL @@ -315,22 +220,40 @@ class Browser(ExtendedTestBrowser): # In case url_or_path is an absolute URL, urljoin() will return # it, otherwise it is a relative path and will be concatenated to # ERP5 base URL - url_or_path = urlparse.urljoin(self._erp5_base_url, url_or_path) + url_or_path = urljoin(self._erp5_base_url, url_or_path) + + import mechanize if isinstance(data, dict): data = urllib.urlencode(data) - url = self._absoluteUrl(url_or_path) - self._logger.debug("Opening: " + url) - - if data is not None: - def make_request(args): - return self.testapp.post(url, data, **args) - else: - def make_request(args): - return self.testapp.get(url, **args) - - return self._processRequest(url, make_request, no_visit=True) + response = None + url_or_path = str(url_or_path) + self._logger.debug("Opening: " + url_or_path) + self._start_timer() + try: + try: + try: + response = self.mech_browser.open_novisit(url_or_path, data) + except Exception, e: + raise + except mechanize.HTTPError, e: + if e.code >= 200 and e.code <= 299: + # 200s aren't really errors + pass + elif self.raiseHttpErrors: + raise + finally: + self._stop_timer() + + # if the headers don't have a status, I suppose there can't be an error + if 'Status' in self.headers: + code, msg = self.headers['Status'].split(' ', 1) + code = int(code) + if self.raiseHttpErrors and code >= 400: + raise mechanize.HTTPError(url_or_path, code, msg, self.headers, fp=None) + + return response def randomSleep(self, minimum, maximum): """ @@ -434,28 +357,31 @@ class Browser(ExtendedTestBrowser): elif url and '?' not in url: url += '?' - from zope.testbrowser.browser import isMatching, LinkNotFoundError - qa = 'a' if id is None else 'a#%s' % id - qarea = 'area' if id is None else 'area#%s' % id - html = self._html - links = html.select(qa) - links.extend(html.select(qarea)) - - matching = [] - for elem in links: - matches = (isMatching(elem.text.encode('utf-8'), text) and - isMatching(elem.get('href', ''), url)) - - if matches: - matching.append(elem) + if id is not None: + def predicate(link): + return dict(link.attrs).get('id') == id + args = {'predicate': predicate} + else: + import re + from zope.testbrowser.browser import RegexType - if index >= len(matching): - raise LinkNotFoundError() - elem = matching[index] + if isinstance(text, RegexType): + text_regex = text + elif text is not None: + text_regex = re.compile(re.escape(text), re.DOTALL) + else: + text_regex = None - baseurl = self._getBaseUrl() + if isinstance(url, RegexType): + url_regex = url + elif url is not None: + url_regex = re.compile(re.escape(url), re.DOTALL) + else: + url_regex = None + args = {'text_regex': text_regex, 'url_regex': url_regex} - return LinkWithTime(elem, self, baseurl) + args['nr'] = index + return LinkWithTime(self.mech_browser.find_link(**args), self) def getImportExportLink(self): """ @@ -681,8 +607,8 @@ class Browser(ExtendedTestBrowser): @rtype: int """ self._logger.debug("Checking the number of remaining activities") - response = self.openNoVisit('portal_activities/countMessage')[1] - activity_counter = response.body + activity_counter = self.mech_browser.open_novisit( + self._erp5_base_url + 'portal_activities/countMessage').read() activity_counter = activity_counter and int(activity_counter) or 0 self._logger.debug("Remaining activities: %d" % activity_counter) @@ -1289,23 +1215,26 @@ class ImageControlWithTime(ImageControl): import zope.testbrowser.browser -browser_simpleControlFactory = zope.testbrowser.browser.simpleControlFactory -def simpleControlFactory(wtcontrol, form, elemindex, browser): +browser_controlFactory = zope.testbrowser.browser.controlFactory +def controlFactory(control, *args, **kwargs): """ - Monkey patched to get elapsed time on ImageControl and SubmitControl + Monkey patch controlFactory in zope.testbrowser to get elapsed time on + ImageControl and SubmitControl """ - import webtest - - elem = elemindex[wtcontrol.pos] - if isinstance(wtcontrol, webtest.forms.Submit): - if wtcontrol.attrs.get('type', 'submit') == 'image': - return ImageControlWithTime(wtcontrol, form, elem, browser) - else: - return SubmitControlWithTime(wtcontrol, form, elem, browser) - - return browser_simpleControlFactory(wtcontrol, form, elemindex, browser) - -zope.testbrowser.browser.simpleControlFactory = simpleControlFactory + try: + t = control.type + except AttributeError: + # This is a subcontrol + pass + else: + if t in ('submit', 'submitbutton'): + return SubmitControlWithTime(control, *args, **kwargs) + elif t == 'image': + return ImageControlWithTime(control, *args, **kwargs) + + return browser_controlFactory(control, *args, **kwargs) + +zope.testbrowser.browser.controlFactory = controlFactory from zope.testbrowser.browser import Link -- 2.30.9 From 48e6c178be8084320ba0345c367b74c4b68ee36b Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Mon, 30 Jul 2018 13:14:17 +0000 Subject: [PATCH 11/12] Updating appcache with see_history files. --- .../gadget_officejs_text_editor_appcache.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml index d8e84e38401..ca33fbd47fb 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_text_editor_appcache.xml @@ -153,6 +153,8 @@ gadget_erp5_page_ojs_controller.html\n gadget_erp5_page_ojs_controller.js\n gadget_erp5_page_ojs_add_document.html\n gadget_erp5_page_ojs_add_document.js\n +gadget_erp5_page_ojs_see_history.html\n +gadget_erp5_page_ojs_see_history.js\n gadget_erp5_page_ojs_configurator.html\n gadget_erp5_page_ojs_configurator.js\n gadget_erp5_page_ojs_dav_configurator.html\n @@ -685,7 +687,7 @@ NETWORK:\n actor - vincent + zope comment @@ -699,7 +701,7 @@ NETWORK:\n serial - 964.48519.41997.58350 + 969.16222.16646.56320 state @@ -717,7 +719,7 @@ NETWORK:\n - 1515675473.77 + 1532954835.43 UTC -- 2.30.9 From ea2a33560c762792cae01089832d0b6fc4c2519e Mon Sep 17 00:00:00 2001 From: Bryan Kaperick Date: Fri, 3 Aug 2018 08:37:16 +0000 Subject: [PATCH 12/12] Changed location of history button. --- ...get_officejs_erp5_page_document_list_js.js | 6 ++-- ...et_officejs_erp5_page_document_list_js.xml | 4 +-- ...officejs_erp5_page_ojs_add_document_js.xml | 4 +-- ...et_officejs_erp5_page_see_history_html.xml | 4 +-- ...adget_officejs_erp5_page_see_history_js.js | 31 +++++++++++++++---- ...dget_officejs_erp5_page_see_history_js.xml | 4 +-- ...gadget_officejs_jio_web_page_view_html.xml | 4 +-- .../gadget_officejs_jio_web_page_view_js.js | 7 +++-- .../gadget_officejs_jio_web_page_view_js.xml | 6 ++-- 9 files changed, 44 insertions(+), 26 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js index e59159ae3f4..901fc2ee39b 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.js @@ -128,16 +128,14 @@ .push(function () { return RSVP.all([ gadget.getUrlFor({command: "change", options: {"page": "ojs_add_document"}}), - gadget.getSetting('document_title_plural'), - gadget.getUrlFor({command: "change", options: {"page": "ojs_see_history"}}) + gadget.getSetting('document_title_plural') ]); }) .push(function (result) { return gadget.updateHeader({ page_title: result[1], filter_action: true, - add_url: result[0], - see_history: result[2] + add_url: result[0] }); }); }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml index 6b7d37b8fa8..1ad129bc8a7 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_document_list_js.xml @@ -270,7 +270,7 @@ serial - 968.63193.3444.40072 + 969.18805.18330.41284 state @@ -288,7 +288,7 @@ - 1532440204.49 + 1533116145.35 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.xml index 69452606e24..0feba4ad8d0 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.xml @@ -270,7 +270,7 @@ serial - 963.44293.58168.6690 + 969.18811.39108.45789 state @@ -288,7 +288,7 @@ - 1511565609.05 + 1533116016.94 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml index 67af727f986..f68b577c2c7 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_html.xml @@ -272,7 +272,7 @@ serial - 968.61646.7207.32238 + 969.19202.56498.49408 state @@ -290,7 +290,7 @@ - 1531748492.08 + 1533136512.61 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js index 701495988d1..bbb962288c2 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.js @@ -14,17 +14,33 @@ .declareAcquiredMethod("getSetting", "getSetting") .declareAcquiredMethod("jio_toggleRevisionOption", "jio_toggleRevisionOption") + //.declareAcquiredMethod("getId") + + .setState({jio_key: undefined}) ///////////////////////////////////////////////////////////////// // declared methods ///////////////////////////////////////////////////////////////// .allowPublicAcquisition("jio_allDocs", function (param_list) { - var gadget = this; + var gadget = this, + jio_key, + result; return gadget.jio_toggleRevisionOption(true) .push(function () { - return gadget.jio_allDocs(param_list[0]); + console.log(param_list[0]); + console.log(gadget.state.jio_key); + return gadget.jio_allDocs({query: "doc_id: " + gadget.state.jio_key); }) - .push(function (result) { + .push(function (timestamps) { + console.log("timestamps: ", timestamps); + param_list[0].select_list.push(gadget.state.jio_key); + }) + .push(function (res) { + result = res; + return gadget.jio_toggleRevisionOption(false); + }) + .push(function () { + console.log(result); var i, date, len = result.data.total_rows; for (i = 0; i < len; i += 1) { if (result.data.rows[i].value.hasOwnProperty("modification_date")) { @@ -68,17 +84,19 @@ }); }) - .declareMethod("render", function () { + .declareMethod("render", function (options) { var gadget = this; return new RSVP.Queue() .push(function () { return RSVP.all([ gadget.getDeclaredGadget('form_list'), - gadget.getSetting("portal_type") + gadget.getSetting("portal_type"), + gadget.changeState({jio_key: options.jio_key}) ]); }) .push(function (result) { + console.log("result 1: ", result[1]); var column_list = [ ['title', 'Title'], ['reference', 'Reference'], @@ -121,7 +139,8 @@ "bottom", [["listbox"]] ]] - } + }, + jio_key: options.jio_key }); }) .push(function () { diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml index 5c360f53a47..359ea267f51 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_see_history_js.xml @@ -268,7 +268,7 @@ serial - 968.63202.32840.27340 + 969.21731.6944.62361 state @@ -286,7 +286,7 @@ - 1531923217.03 + 1533285349.95 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.xml index 5dc908a56f6..eea64e07df3 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_html.xml @@ -236,7 +236,7 @@ serial - 960.57151.51816.16622 + 968.44071.55411.42615 state @@ -254,7 +254,7 @@ - 1501251929.75 + 1533135741.41 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js index ff4406faa45..b95cb9589f1 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.js @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////// // declared methods ///////////////////////////////////////////////////////////////// - .declareMethod("render", function (options) { return this.changeState({ jio_key: options.jio_key, @@ -150,7 +149,8 @@ return RSVP.all([ gadget.getUrlFor({command: 'history_previous'}), gadget.getUrlFor({command: 'selection_previous'}), - gadget.getUrlFor({command: 'selection_next'}) + gadget.getUrlFor({command: 'selection_next'}), + gadget.getUrlFor({command: "change", options: {"page": "ojs_see_history"}}) ]); }) .push(function (url_list) { @@ -159,7 +159,8 @@ save_action: true, selection_url: url_list[0], previous_url: url_list[1], - next_url: url_list[2] + next_url: url_list[2], + see_history: url_list[3] }); }); }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml index 0e76ea42e23..534cf497be7 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_web_page_view_js.xml @@ -218,7 +218,7 @@ actor - vincent + zope comment @@ -232,7 +232,7 @@ serial - 964.48513.5538.10342 + 969.19249.10625.64000 state @@ -250,7 +250,7 @@ - 1515766909.33 + 1533136525.71 UTC -- 2.30.9