summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2011-12-05 10:58:43 +0100
committerFabien Meghazi <fme@openerp.com>2011-12-05 10:58:43 +0100
commitd7cab2845528e99e9cd4bf72ca2998b4116ba9cb (patch)
tree7b5573c3248f562cd71edac51e7cd359c816a338
parent8aadbe52880d54baae03f41c1f277c28119833d4 (diff)
[IMP] Calendar: No need to do default_get by hand
The form will already do a default_get on do_show() when index is null bzr revid: fme@openerp.com-20111205095843-7ll9yna17dnltx6v
-rw-r--r--addons/web_calendar/static/src/js/calendar.js29
1 files changed, 13 insertions, 16 deletions
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index ab81c16c586..75b168ccf5a 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -263,24 +263,21 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
data = this.get_event_data(event_obj),
form = self.form_dialog.form,
fields_to_fetch = _(form.fields_view.fields).keys();
+ this.dataset.index = null;
self.creating_event_id = event_id;
- self.dataset.default_get(fields_to_fetch, function(default_values) {
- form.on_record_loaded(default_values).then(function() {
- form.show_invalid = false;
- _.each(['date_start', 'date_stop', 'date_delay'], function(field) {
- var field_name = self[field];
- if (field_name) {
- field = form.fields[field_name];
- field.set_value(data[field_name]);
- field.dirty = true;
- form.do_onchange(field);
- }
- });
- form.show_invalid = true;
- form.do_show().then(function() {
- self.form_dialog.open();
- });
+ this.form_dialog.form.do_show().then(function() {
+ form.show_invalid = false;
+ _.each(['date_start', 'date_stop', 'date_delay'], function(field) {
+ var field_name = self[field];
+ if (field_name) {
+ field = form.fields[field_name];
+ field.set_value(data[field_name]);
+ field.dirty = true;
+ form.do_onchange(field);
+ }
});
+ form.show_invalid = true;
+ self.form_dialog.open();
});
},
do_save_event: function(event_id, event_obj) {