pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] trunk-trigger-on_pager_action.

Browse Source 
bzr revid: vta@openerp.com-20121012091915-0pqfqkhd7ysrc0vd
This commit is contained in:
vta vta@openerp.com
2012-10-12 11:19:15 +02:00
parent d17b33aea6 885f9c4042
commit ff40df4e66
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/view_form.js
+5 -6
View File
@@ -431,7 +431,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
do_notify_change: function() {
this.$el.add(this.$buttons).addClass('oe_form_dirty');
},
on_pager_action: function(action) {
execute_pager_action: function(action) {
if (this.can_be_discarded()) {
switch (action) {
case 'first':
@@ -448,6 +448,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
break;
}
this.reload();
this.trigger('pager_action_executed');
}
},
init_pager: function() {
@@ -464,7 +465,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}
this.$pager.on('click','a[data-pager-action]',function() {
var action = $(this).data('pager-action');
self.on_pager_action(action);
self.execute_pager_action(action);
});
this.do_update_pager();
},
@@ -799,7 +800,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
$.when(this.has_been_loaded).then(function() {
if (self.datarecord.id && confirm(_t("Do you really want to delete this record?"))) {
self.dataset.unlink([self.datarecord.id]).then(function() {
self.on_pager_action('next');
self.execute_pager_action('next');
def.resolve();
});
} else {
@@ -3385,9 +3386,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
controller.on("load_record", self, function(){
once.resolve();
});
controller.on_pager_action.add_first(function() {
self.save_any_view();
});
controller.on('pager_action_executed',self,self.save_any_view);
} else if (view_type == "graph") {
self.reload_current_view()
}
addons/web_diagram/static/src/js/diagram.js
+3 -3
View File
@@ -57,7 +57,7 @@ instance.web.DiagramView = instance.web.View.extend({
this.$el.find('div.oe_diagram_pager button[data-pager-action]').click(function() {
var action = $(this).data('pager-action');
self.on_pager_action(action);
self.execute_pager_action(action);
});
this.do_update_pager();
@@ -347,7 +347,7 @@ instance.web.DiagramView = instance.web.View.extend({
});
},
on_pager_action: function(action) {
execute_pager_action: function(action) {
switch (action) {
case 'first':
this.dataset.index = 0;
@@ -380,7 +380,7 @@ instance.web.DiagramView = instance.web.View.extend({
do_show: function() {
this.do_push_state({});
return $.when(this._super(), this.on_pager_action('reload'));
return $.when(this._super(), this.execute_pager_action('reload'));
}
});
};