[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:
commit
634736274d
|
@ -1,18 +1,19 @@
|
||||||
openerp.crm_partner_assign = function (instance) {
|
openerp.crm_partner_assign = function (instance) {
|
||||||
instance.crm_partner_assign = instance.crm_partner_assign || {};
|
instance.crm_partner_assign = instance.crm_partner_assign || {};
|
||||||
instance.crm_partner_assign.next_or_list = function(parent) {
|
instance.crm_partner_assign.next_or_list = function(parent) {
|
||||||
if (parent.inner_widget.active_view === "form"){
|
var view = parent.inner_widget.active_view;
|
||||||
var form = parent.inner_widget.views.form.controller;
|
var controller = parent.inner_widget.views[view].controller;
|
||||||
form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]);
|
if (view === "form"){
|
||||||
form.reload();
|
if (controller.dataset.size()) {
|
||||||
if (!form.dataset.ids.length){
|
controller.execute_pager_action('next');
|
||||||
parent.inner_widget.switch_mode('list');
|
} else {
|
||||||
}
|
controller.do_action('history_back');
|
||||||
}
|
}
|
||||||
else{
|
}
|
||||||
parent.inner_widget.views[parent.inner_widget.active_view].controller.reload();
|
controller.do_action({ type: 'ir.actions.act_window_close' });
|
||||||
}
|
if (view === "list"){
|
||||||
parent.do_action({ type: 'ir.actions.act_window_close' });
|
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");
|
instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list");
|
||||||
}
|
}
|
Loading…
Reference in New Issue