From c7bc4b685911ef1a9d8461ee63b6aa062cd84bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@tiolive.com> Date: Sun, 16 Jul 2017 12:35:40 +0000 Subject: [PATCH] erp5_officejs: Bookmark, remove CRLF endlines on a few files --- .../gadget_officejs_page_add_bookmark_js.js | 138 ++++++------ .../gadget_officejs_page_add_bookmark_js.xml | 6 +- .../gadget_officejs_page_bookmark_list_js.js | 212 +++++++++--------- .../gadget_officejs_page_bookmark_list_js.xml | 6 +- 4 files changed, 181 insertions(+), 181 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.js index bc1dac0f04..e465a3e7ea 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.js @@ -1,70 +1,70 @@ -/*globals window, RSVP, rJS*/ -/*jslint indent: 2, nomen: true, maxlen: 80*/ -(function (window, RSVP, rJS) { - "use strict"; - - var gadget_klass = rJS(window); - - gadget_klass - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - g.props.deferred = RSVP.defer(); - }); - }) - - .declareAcquiredMethod("post", "jio_post") - .declareAcquiredMethod("redirect", "redirect") - .declareAcquiredMethod("updateHeader", "updateHeader") - .declareAcquiredMethod('getSetting', 'getSetting') - - .declareMethod("render", function (options) { - var gadget = this; - gadget.props.options = options; - return new RSVP.Queue() - .push(function () { - return RSVP.all([ - gadget.getSetting("portal_type"), - gadget.getSetting("document_title"), - gadget.getSetting("parent_relative_url") - ]); - }).push(function (answer_list) { - gadget.props.portal_type = answer_list[0]; - gadget.props.document_title = answer_list[1]; - gadget.props.parent_relative_url = answer_list[2]; - return gadget.updateHeader({ - title: "New " + gadget.props.document_title - }); - }) - .push(function () { - gadget.props.deferred.resolve(); - }); - }) - - .declareService(function () { - var gadget = this; - - return new RSVP.Queue() - .push(function () { - return gadget.props.deferred.promise; - }) - .push(function () { - var doc = { - // XXX Hardcoded - parent_relative_url: gadget.props.parent_relative_url, - portal_type: gadget.props.portal_type - }; - return gadget.post(doc); - }) - .push(function (data) { - return gadget.redirect({ - jio_key: data, - page: "view" - }); - }); - - }); - +/*globals window, RSVP, rJS*/ +/*jslint indent: 2, nomen: true, maxlen: 80*/ +(function (window, RSVP, rJS) { + "use strict"; + + var gadget_klass = rJS(window); + + gadget_klass + .ready(function (g) { + g.props = {}; + return g.getElement() + .push(function (element) { + g.props.element = element; + g.props.deferred = RSVP.defer(); + }); + }) + + .declareAcquiredMethod("post", "jio_post") + .declareAcquiredMethod("redirect", "redirect") + .declareAcquiredMethod("updateHeader", "updateHeader") + .declareAcquiredMethod('getSetting', 'getSetting') + + .declareMethod("render", function (options) { + var gadget = this; + gadget.props.options = options; + return new RSVP.Queue() + .push(function () { + return RSVP.all([ + gadget.getSetting("portal_type"), + gadget.getSetting("document_title"), + gadget.getSetting("parent_relative_url") + ]); + }).push(function (answer_list) { + gadget.props.portal_type = answer_list[0]; + gadget.props.document_title = answer_list[1]; + gadget.props.parent_relative_url = answer_list[2]; + return gadget.updateHeader({ + title: "New " + gadget.props.document_title + }); + }) + .push(function () { + gadget.props.deferred.resolve(); + }); + }) + + .declareService(function () { + var gadget = this; + + return new RSVP.Queue() + .push(function () { + return gadget.props.deferred.promise; + }) + .push(function () { + var doc = { + // XXX Hardcoded + parent_relative_url: gadget.props.parent_relative_url, + portal_type: gadget.props.portal_type + }; + return gadget.post(doc); + }) + .push(function (data) { + return gadget.redirect({ + jio_key: data, + page: "view" + }); + }); + + }); + }(window, RSVP, rJS)); \ No newline at end of file diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.xml index 3804c68540..d3c5783d03 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.xml @@ -222,7 +222,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>zope</string> </value> + <value> <string>cedric.le.ninivin</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -236,7 +236,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>956.64652.42771.37444</string> </value> + <value> <string>960.50178.45695.2645</string> </value> </item> <item> <key> <string>state</string> </key> @@ -254,7 +254,7 @@ </tuple> <state> <tuple> - <float>1485780817.22</float> + <float>1500208399.34</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.js index 73eebc2d39..5d94817bec 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.js @@ -1,107 +1,107 @@ -/*globals window, RSVP, rJS*/ -/*jslint indent: 2, nomen: true, maxlen: 80*/ -(function (window, RSVP, rJS) { - "use strict"; - - rJS(window) - .ready(function (g) { - g.props = {}; - return g.getElement() - .push(function (element) { - g.props.element = element; - }); - }) - .ready(function (g) { - return new RSVP.Queue() - .push(function () { - return RSVP.all([ - g.translate("validated"), - g.translate("invalidated"), - g.translate("Not synced!"), - g.translate("Waiting for approval") - ]); - }) - .push(function (result_list) { - g.props.translation_dict = { - "validated": result_list[0], - "invalidated": result_list[1], - "Not synced!": result_list[2], - "Waiting for approval": result_list[3] - }; - }); - }) - .declareAcquiredMethod("translate", "translate") - .declareAcquiredMethod("getUrlFor", "getUrlFor") - .declareAcquiredMethod("updateHeader", "updateHeader") - .declareAcquiredMethod('getSetting', 'getSetting') - .declareAcquiredMethod("jio_allDocs", "jio_allDocs") - .allowPublicAcquisition("jio_allDocs", function (param_list) { - var gadget = this; - return this.jio_allDocs.apply(this, param_list) - .push(function (result) { - var i, - len; - for (i = 0, len = result.data.total_rows; i < len; i += 1) { - // XXX jIO does not create UUID with module inside - if (result.data.rows[i].id.indexOf("module") === -1) { - result.data.rows[i].value.state = - gadget.props.translation_dict["Not synced!"]; - } else { - result.data.rows[i].value.state = - gadget.props.translation_dict[ - result.data.rows[i].value.local_state || - "Waiting for approval" - ]; - } - } - return result; - }); - }) - .declareMethod("render", function (options) { - var gadget = this; - return new RSVP.Queue() - .push(function () { - return RSVP.all([ - gadget.getSetting("portal_type"), - gadget.getSetting("document_title_plural") - ]); - }) - .push(function (answer_list) { - gadget.props.portal_type = answer_list[0]; - gadget.props.bookmark_title_plural = answer_list[1]; - return gadget.getUrlFor({page: "add_bookmark"}); - }) - .push(function (url) { - return gadget.updateHeader({ - title: gadget.props.bookmark_title_plural, - add_url: url - }); - }) - .push(function () { - return gadget.getDeclaredGadget("listbox"); - }) - .push(function (listbox) { - return listbox.render({ - search_page: 'bookmark_list', - search: options.search, - column_list: [{ - select: 'title', - title: 'Title' - }, { - select: 'url_string', - title: 'URL' - }, { - select: 'description', - title: 'Description' - }], - query: { - query: 'portal_type:("' + gadget.props.portal_type + '")', - select_list: ['title', 'url_string', 'description'], - limit: [0, 30], - sort_on: [["modification_date", "descending"]] - } - }); - }); - }); - +/*globals window, RSVP, rJS*/ +/*jslint indent: 2, nomen: true, maxlen: 80*/ +(function (window, RSVP, rJS) { + "use strict"; + + rJS(window) + .ready(function (g) { + g.props = {}; + return g.getElement() + .push(function (element) { + g.props.element = element; + }); + }) + .ready(function (g) { + return new RSVP.Queue() + .push(function () { + return RSVP.all([ + g.translate("validated"), + g.translate("invalidated"), + g.translate("Not synced!"), + g.translate("Waiting for approval") + ]); + }) + .push(function (result_list) { + g.props.translation_dict = { + "validated": result_list[0], + "invalidated": result_list[1], + "Not synced!": result_list[2], + "Waiting for approval": result_list[3] + }; + }); + }) + .declareAcquiredMethod("translate", "translate") + .declareAcquiredMethod("getUrlFor", "getUrlFor") + .declareAcquiredMethod("updateHeader", "updateHeader") + .declareAcquiredMethod('getSetting', 'getSetting') + .declareAcquiredMethod("jio_allDocs", "jio_allDocs") + .allowPublicAcquisition("jio_allDocs", function (param_list) { + var gadget = this; + return this.jio_allDocs.apply(this, param_list) + .push(function (result) { + var i, + len; + for (i = 0, len = result.data.total_rows; i < len; i += 1) { + // XXX jIO does not create UUID with module inside + if (result.data.rows[i].id.indexOf("module") === -1) { + result.data.rows[i].value.state = + gadget.props.translation_dict["Not synced!"]; + } else { + result.data.rows[i].value.state = + gadget.props.translation_dict[ + result.data.rows[i].value.local_state || + "Waiting for approval" + ]; + } + } + return result; + }); + }) + .declareMethod("render", function (options) { + var gadget = this; + return new RSVP.Queue() + .push(function () { + return RSVP.all([ + gadget.getSetting("portal_type"), + gadget.getSetting("document_title_plural") + ]); + }) + .push(function (answer_list) { + gadget.props.portal_type = answer_list[0]; + gadget.props.bookmark_title_plural = answer_list[1]; + return gadget.getUrlFor({page: "add_bookmark"}); + }) + .push(function (url) { + return gadget.updateHeader({ + title: gadget.props.bookmark_title_plural, + add_url: url + }); + }) + .push(function () { + return gadget.getDeclaredGadget("listbox"); + }) + .push(function (listbox) { + return listbox.render({ + search_page: 'bookmark_list', + search: options.search, + column_list: [{ + select: 'title', + title: 'Title' + }, { + select: 'url_string', + title: 'URL' + }, { + select: 'description', + title: 'Description' + }], + query: { + query: 'portal_type:("' + gadget.props.portal_type + '")', + select_list: ['title', 'url_string', 'description'], + limit: [0, 30], + sort_on: [["modification_date", "descending"]] + } + }); + }); + }); + }(window, RSVP, rJS)); \ No newline at end of file diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.xml index 0bd94ae411..a00cb1ae7d 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.xml @@ -222,7 +222,7 @@ </item> <item> <key> <string>actor</string> </key> - <value> <string>zope</string> </value> + <value> <string>cedric.le.ninivin</string> </value> </item> <item> <key> <string>comment</string> </key> @@ -236,7 +236,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>956.64652.30281.58163</string> </value> + <value> <string>960.50478.26108.37085</string> </value> </item> <item> <key> <string>state</string> </key> @@ -254,7 +254,7 @@ </tuple> <state> <tuple> - <float>1485780674.63</float> + <float>1500225770.04</float> <string>UTC</string> </tuple> </state> -- 2.30.9