Reviewers: ,
Please review this at http://codereview.tryton.org/23002/ Affected files: M tryton/gui/window/form.py M tryton/gui/window/view_form/screen/screen.py Index: tryton/gui/window/form.py =================================================================== --- a/tryton/gui/window/form.py +++ b/tryton/gui/window/form.py @@ -297,7 +297,7 @@ else: msg = _('Are you sure to remove those records?') if sur(msg, self.window): - if not self.screen.remove(delete=True): + if not self.screen.remove(delete=True, force_remove=True): self.message_info(_('Records not removed!')) else: self.message_info(_('Records removed!'), 'green') Index: tryton/gui/window/view_form/screen/screen.py =================================================================== --- a/tryton/gui/window/view_form/screen/screen.py +++ b/tryton/gui/window/view_form/screen/screen.py @@ -519,10 +519,11 @@ self.request_set() def unremove(self): - if self.current_record in self.group: - self.group.unremove(self.current_record) + records = self.current_view.selected_records() + for record in records: + self.group.unremove(record) - def remove(self, delete=False, remove=False): + def remove(self, delete=False, remove=False, force_remove=False): res = False reload_ids = [] if self.current_view.view_type == 'form' and self.current_record: @@ -597,7 +598,7 @@ # to save the previous_model as it can be already deleted. self.current_record = None record.group.remove(record, remove=remove, signal=False, - force_remove=True) + force_remove=force_remove) # send record-changed only once record.signal('record-changed') -- [email protected] mailing list
