diff options
| author | Christophe Matthieu <chm@odoo.com> | 2017-02-23 10:14:57 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-04-11 19:44:38 +0200 |
| commit | 173896b62d2c2d3c4acc6be75c3396b29887e4fb (patch) | |
| tree | 09ea86ccb845313e07adbd21c01e7cad1853c85f /addons/web/static/src/js/widgets | |
| parent | c9f747dad646b48d3dc9fed799df046180526531 (diff) | |
[REF] web: remove format.js
use 'web.field_utils' instead of 'web.formats'
Diffstat (limited to 'addons/web/static/src/js/widgets')
| -rw-r--r-- | addons/web/static/src/js/widgets/date_picker.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/debug_manager.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/domain_selector.js | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js index 4877a17c3ce..3fe9988467a 100644 --- a/addons/web/static/src/js/widgets/date_picker.js +++ b/addons/web/static/src/js/widgets/date_picker.js @@ -2,7 +2,7 @@ odoo.define('web.datepicker', function (require) { "use strict"; var core = require('web.core'); -var formats = require('web.formats'); +var field_utils = require('web.field_utils'); var time = require('web.time'); var Widget = require('web.Widget'); @@ -83,10 +83,10 @@ var DateWidget = Widget.extend({ } }, parse_client: function(v) { - return formats.parse_value(v, {"widget": this.type_of_date}); + return field_utils.parse_field(v, {type: this.type_of_date}); }, format_client: function(v) { - return formats.format_value(v, {"widget": this.type_of_date}); + return field_utils.format_field(v, {type: this.type_of_date}); }, set_datetime_default: function() { //when opening datetimepicker the date and time by default should be the one from diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js index 44845f7b9e6..2689d789431 100644 --- a/addons/web/static/src/js/widgets/debug_manager.js +++ b/addons/web/static/src/js/widgets/debug_manager.js @@ -5,7 +5,7 @@ var ActionManager = require('web.ActionManager'); var dialogs = require('web.view_dialogs'); var core = require('web.core'); var Dialog = require('web.Dialog'); -var formats = require('web.formats'); +var field_utils = require('web.field_utils'); var framework = require('web.framework'); var Model = require('web.Model'); var session = require('web.session'); @@ -327,7 +327,7 @@ DebugManager.include({ size: 'medium', $content: QWeb.render('WebClient.DebugViewLog', { perm : result[0], - format : formats.format_value + format : field_utils.format_field }) }).open(); }); diff --git a/addons/web/static/src/js/widgets/domain_selector.js b/addons/web/static/src/js/widgets/domain_selector.js index 81d5047a5bc..f7c67aa37cb 100644 --- a/addons/web/static/src/js/widgets/domain_selector.js +++ b/addons/web/static/src/js/widgets/domain_selector.js @@ -4,7 +4,7 @@ odoo.define("web.DomainSelector", function (require) { var core = require("web.core"); var datepicker = require("web.datepicker"); var Domain = require("web.Domain"); -var formats = require ("web.formats"); +var field_utils = require ("web.field_utils"); var ModelFieldSelector = require("web.ModelFieldSelector"); var Widget = require("web.Widget"); @@ -378,7 +378,7 @@ var DomainLeaf = DomainNode.extend({ try { var f = this.fieldSelector.selectedField; if (!f.relation) { // TODO in this case, the value should be m2o input, etc... - this.displayValue = formats.format_value(this.value, this.fieldSelector.selectedField); + this.displayValue = field_utils.format_field(this.value, this.fieldSelector.selectedField); } } catch (err) {/**/} this.displayOperator = this.operator; @@ -466,7 +466,7 @@ var DomainLeaf = DomainNode.extend({ onValueChange: function (value, silent) { var couldNotParse = false; try { - this.value = formats.parse_value(value, this.fieldSelector.selectedField); + this.value = field_utils.parse_field(value, this.fieldSelector.selectedField); } catch (err) { this.value = value; couldNotParse = true; @@ -482,7 +482,7 @@ var DomainLeaf = DomainNode.extend({ } } else if (_.contains(["date", "datetime"], this.fieldSelector.selectedField.type)) { if (couldNotParse || _.isBoolean(this.value)) { - this.value = formats.parse_value(formats.format_value(Date.now(), this.fieldSelector.selectedField), this.fieldSelector.selectedField); + this.value = field_utils.parse_field(field_utils.format_field(Date.now(), this.fieldSelector.selectedField), this.fieldSelector.selectedField); } } else { if (_.isBoolean(this.value)) { // Never display "true" or "false" strings from boolean value |
