[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9138 revid:dle@openerp.com-20140221161633-634gj6mlyyahg867

bzr revid: dle@openerp.com-20140221162025-hphklma6lxtnbp0g
This commit is contained in:
Denis Ledoux 2014-02-21 17:20:25 +01:00
commit 634736274d
1 changed files with 13 additions and 12 deletions

View File

@ -1,18 +1,19 @@
openerp.crm_partner_assign = function (instance) {
instance.crm_partner_assign = instance.crm_partner_assign || {};
instance.crm_partner_assign.next_or_list = function(parent) {
if (parent.inner_widget.active_view === "form"){
var form = parent.inner_widget.views.form.controller;
form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]);
form.reload();
if (!form.dataset.ids.length){
parent.inner_widget.switch_mode('list');
}
}
else{
parent.inner_widget.views[parent.inner_widget.active_view].controller.reload();
}
parent.do_action({ type: 'ir.actions.act_window_close' });
var view = parent.inner_widget.active_view;
var controller = parent.inner_widget.views[view].controller;
if (view === "form"){
if (controller.dataset.size()) {
controller.execute_pager_action('next');
} else {
controller.do_action('history_back');
}
}
controller.do_action({ type: 'ir.actions.act_window_close' });
if (view === "list"){
controller.records.remove(controller.records.get(parent.dialog_widget.action.context.active_id));
}
};
instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list");
}