From db2c85635b00401373d37873ae4df7d75285c45a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 15 Nov 2011 13:30:59 +0100 Subject: [IMP] Upgraded unserscore version from 1.1.7 to 1.2.2 and underscore.string from 1.1.6 to 1.2.0 WARNING: underscore string does not mixin to underscore by default. Use _.str.* bzr revid: fme@openerp.com-20111115123059-k31lhp0db2d8h22k --- addons/web/static/src/js/chrome.js | 42 +++++++++++------------------------ addons/web/static/src/js/core.js | 4 ++-- addons/web/static/src/js/formats.js | 8 +++---- addons/web/static/src/js/search.js | 4 ++-- addons/web/static/src/js/view_form.js | 23 ++++++++----------- addons/web/static/src/js/view_list.js | 8 +++---- addons/web/static/src/js/views.js | 6 ++--- 7 files changed, 37 insertions(+), 58 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 05dc989df03..8da42c37d37 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -158,7 +158,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ }, on_managed_error: function(error) { $('
' + QWeb.render('DialogWarning', {error: error}) + '
').dialog({ - title: "OpenERP " + _.capitalize(error.type), + title: "OpenERP " + _.str.capitalize(error.type), buttons: { Ok: function() { $(this).dialog("close"); @@ -168,7 +168,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({ }, on_traceback: function(error) { var dialog = new openerp.web.Dialog(this, { - title: "OpenERP " + _.capitalize(error.type), + title: "OpenERP " + _.str.capitalize(error.type), autoOpen: true, width: '90%', height: '90%', @@ -242,8 +242,10 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database this.$option_id = $('#' + option_id); }, start: function() { - this._super(); this.$element.html(QWeb.render("Database", this)); + this.$element.closest(".openerp") + .removeClass("login-mode") + .addClass("database_block"); var self = this; var fetch_db = this.rpc("/web/database/get_list", {}, function(result) { @@ -264,29 +266,22 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database this.$element.find('#db-restore').click(this.do_restore); this.$element.find('#db-change-password').click(this.do_change_password); this.$element.find('#back-to-login').click(function() { - self.hide(); + self.stop(); }); }, stop: function () { - this.hide(); this.$option_id.empty(); this.$element .find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login') .unbind('click') .end() - .empty(); - this._super(); - }, - show: function () { - this.$element.closest(".openerp") - .removeClass("login-mode") - .addClass("database_block"); - }, - hide: function () { - this.$element.closest(".openerp") + .closest(".openerp") .addClass("login-mode") .removeClass("database_block") + .end() + .empty(); + this._super(); }, /** * Converts a .serializeArray() result into a dict. Does not bother folding @@ -373,7 +368,6 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database } self.db_list.push(self.to_object(fields)['db_name']); self.db_list.sort(); - self.widget_parent.set_db_list(self.db_list); var form_obj = self.to_object(fields); self.wait_for_newdb(result, { password: form_obj['super_admin_pwd'], @@ -403,7 +397,6 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database } $db_list.find(':selected').remove(); self.db_list.splice(_.indexOf(self.db_list, db, true), 1); - self.widget_parent.set_db_list(self.db_list); self.do_notify("Dropping database", "The database '" + db + "' has been dropped"); }); } @@ -536,16 +529,16 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ var self = this; this.database = new openerp.web.Database( this, "oe_database", "oe_db_options"); - this.database.start(); this.$element.find('#oe-db-config').click(function() { - self.database.show(); + self.database.start(); }); this.$element.find("form").submit(this.on_submit); this.rpc("/web/database/get_list", {}, function(result) { - self.set_db_list(result.db_list); + var tpl = openerp.web.qweb.render('Login_dblist', {db_list: result.db_list, selected_db: self.selected_db}); + self.$element.find("input[name=db]").replaceWith(tpl) }, function(error, event) { if (error.data.fault_code === 'AccessDenied') { @@ -554,15 +547,6 @@ openerp.web.Login = openerp.web.Widget.extend(/** @lends openerp.web.Login# */{ }); }, - stop: function () { - this.database.stop(); - this._super(); - }, - set_db_list: function (list) { - this.$element.find("[name=db]").replaceWith( - openerp.web.qweb.render('Login_dblist', { - db_list: list, selected_db: this.selected_db})) - }, on_login_invalid: function() { this.$element.closest(".openerp").addClass("login-mode"); }, diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 369e1191665..f77f9bf1041 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -716,7 +716,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. if (parseInt(cookie_val, 10) !== token) { continue; } // clear cookie - document.cookie = _.sprintf("%s=;expires=%s;path=/", + document.cookie = _.str.sprintf("%s=;expires=%s;path=/", cookie_name, new Date().toGMTString()); if (options.success) { options.success(); } complete(); @@ -1055,7 +1055,7 @@ openerp.web.qweb.format_text_node = function(s) { if (translation && translation.value === 'off') { return s; } - var ts = _.trim(s); + var ts = _.str.trim(s); if (ts.length === 0) { return s; } diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index c4af2d0cf6b..23d8a2c24e0 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -86,18 +86,18 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) { switch (descriptor.widget || descriptor.type) { case 'integer': return openerp.web.insert_thousand_seps( - _.sprintf('%d', value)); + _.str.sprintf('%d', value)); case 'float': var precision = descriptor.digits ? descriptor.digits[1] : 2; - var formatted = _.sprintf('%.' + precision + 'f', value).split('.'); + var formatted = _.str.sprintf('%.' + precision + 'f', value).split('.'); formatted[0] = openerp.web.insert_thousand_seps(formatted[0]); return formatted.join(l10n.decimal_point); case 'float_time': - return _.sprintf("%02d:%02d", + return _.str.sprintf("%02d:%02d", Math.floor(value), Math.round((value % 1) * 60)); case 'progressbar': - return _.sprintf( + return _.str.sprintf( '%.2f%%', value, value); case 'many2one': diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 4fb5f02c690..c82584e87f8 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -137,7 +137,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search on_loaded: function(data) { if (data.fields_view.type !== 'search' || data.fields_view.arch.tag !== 'search') { - throw new Error(_.sprintf( + throw new Error(_.str.sprintf( "Got non-search view after asking for a search view: type %s, arch root %s", data.fields_view.type, data.fields_view.arch.tag)); } @@ -425,7 +425,7 @@ openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.se this.message = message; }, toString: function () { - return _.sprintf( + return _.str.sprintf( _t("Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"), {fieldname: this.field, value: this.value, message: this.message} ); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 861d45dcb19..2bcd9971c6d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -240,7 +240,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# try { processed = processed || []; if (widget.node.attrs.on_change) { - var onchange = _.trim(widget.node.attrs.on_change); + var onchange = _.str.trim(widget.node.attrs.on_change); var call = onchange.match(/^\s?(.*?)\((.*?)\)\s?$/); if (call) { var method = call[1], args = []; @@ -257,7 +257,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# }; var parent_fields = null; _.each(call[2].split(','), function(a, i) { - var field = _.trim(a); + var field = _.str.trim(a); if (field in argument_replacement) { args.push(argument_replacement[field](i)); return; @@ -267,11 +267,11 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# return; } else { var splitted = field.split('.'); - if (splitted.length > 1 && _.trim(splitted[0]) === "parent" && self.dataset.parent_view) { + if (splitted.length > 1 && _.str.trim(splitted[0]) === "parent" && self.dataset.parent_view) { if (parent_fields === null) { parent_fields = self.dataset.parent_view.get_fields_values(); } - var p_val = parent_fields[_.trim(splitted[1])]; + var p_val = parent_fields[_.str.trim(splitted[1])]; if (p_val !== undefined) { args.push(p_val == null ? false : p_val); return; @@ -638,7 +638,7 @@ openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({ }, on_attachment_delete: function(e) { var self = this, $e = $(e.currentTarget); - var name = _.trim($e.parent().find('a.oe-sidebar-attachments-link').text()); + var name = _.str.trim($e.parent().find('a.oe-sidebar-attachments-link').text()); if (confirm("Do you really want to delete the attachment " + name + " ?")) { this.rpc('/web/dataset/unlink', { model: 'ir.attachment', @@ -798,13 +798,8 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form. _build_view_fields_values: function() { var a_dataset = this.view.dataset; var fields_values = this.view.get_fields_values(); - var active_id = a_dataset.ids[a_dataset.index]; - _.extend(fields_values, { - active_id: active_id || false, - active_ids: active_id ? [active_id] : [], - active_model: a_dataset.model, - parent: a_dataset.parent_view ? a_dataset.parent_view.get_fields_values() : {} - }); + var parent_values = a_dataset.parent_view ? a_dataset.parent_view.get_fields_values() : {}; + fields_values.parent = parent_values; return fields_values; }, _build_eval_context: function() { @@ -1830,7 +1825,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({ if (search_val.length > 0 && !_.include(raw_result, search_val) && (!self.value || search_val !== self.value[1])) { - values.push({label: _.sprintf(_t('   Create "%s"'), + values.push({label: _.str.sprintf(_t('   Create "%s"'), $('').text(search_val).html()), action: function() { self._quick_create(search_val); }}); @@ -2960,7 +2955,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({ render_list: function() { var self = this; var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","), - function(x) { return _.trim(x); }); + function(x) { return _.str.trim(x); }); shown = _.select(shown, function(x) { return x.length > 0; }); if (shown.length == 0) { diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index a976bde8f0b..728b090d679 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -295,7 +295,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# } else { last = first + limit; } - this.$element.find('span.oe-pager-state').empty().text(_.sprintf( + this.$element.find('span.oe-pager-state').empty().text(_.str.sprintf( "[%d to %d] of %d", first + 1, last, total)); this.$element @@ -647,7 +647,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# return; } - $footer_cells.filter(_.sprintf('[data-field=%s]', column.id)) + $footer_cells.filter(_.str.sprintf('[data-field=%s]', column.id)) .html(openerp.web.format_cell(aggregation, column, undefined, false)); }); }, @@ -1192,7 +1192,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L format = "%.2f"; } $('') - .text(_.sprintf(format, value)) + .text(_.str.sprintf(format, value)) .appendTo($row); } else { $row.append(''); @@ -1251,7 +1251,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L var pages = Math.ceil(dataset.ids.length / limit); self.$row .find('.oe-pager-state') - .text(_.sprintf('%d/%d', page + 1, pages)) + .text(_.str.sprintf('%d/%d', page + 1, pages)) .end() .find('button[data-pager-action=previous]') .attr('disabled', page === 0) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index efa5ac5b2a8..d348b2d7240 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -534,7 +534,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner $logs_list = $logs.find('ul').empty(); $logs.toggleClass('oe-has-more', log_records.length > cutoff); _(log_records.reverse()).each(function (record) { - $(_.sprintf('
  • %s
    • ', record.name)) + $(_.str.sprintf('
  • %s
    • ', record.name)) .appendTo($logs_list) .delegate('a', 'click', function (e) { self.do_action({ @@ -628,7 +628,7 @@ session.web.Sidebar = session.web.Widget.extend({ }, add_section: function(name, code) { - if(!code) code = _.underscored(name); + if(!code) code = _.str.underscored(name); var $section = this.sections[code]; if(!$section) { @@ -656,7 +656,7 @@ session.web.Sidebar = session.web.Widget.extend({ // var self = this, - $section = this.add_section(_.titleize(section_code.replace('_', ' ')), section_code), + $section = this.add_section(_.str.titleize(section_code.replace('_', ' ')), section_code), section_id = $section.attr('id'); if (items) { -- cgit v1.2.3