From b8ab5b8d4a4bcb748aa44dcf8e2e068bb8e3b273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 24 Apr 2020 21:55:30 +0200 Subject: [PATCH] Use empty text for empty Reference in editable tree issue9052 review291491002 --- tryton/gui/window/view_form/model/field.py | 4 ++-- tryton/gui/window/view_form/view/list_gtk/editabletree.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py index 93f2de0008..c41c16c1d5 100644 --- a/tryton/gui/window/view_form/model/field.py +++ b/tryton/gui/window/view_form/model/field.py @@ -872,7 +872,7 @@ class ReferenceField(Field): pass if '%s,%s' % (ref_model, ref_id) == self.get(record): rec_name = record.value.get( - self.name + '.', {}).get('rec_name', '') + self.name + '.', {}).get('rec_name') or '' else: rec_name = '' record.value.setdefault(self.name + '.', {})['rec_name'] = rec_name @@ -907,7 +907,7 @@ class ReferenceField(Field): elif ref_model: rec_name = '' else: - rec_name = str(ref_id) + rec_name = str(ref_id) if ref_id is not None else '' record.value[self.name] = ref_model, ref_id record.value.setdefault(self.name + '.', {})['rec_name'] = rec_name diff --git a/tryton/gui/window/view_form/view/list_gtk/editabletree.py b/tryton/gui/window/view_form/view/list_gtk/editabletree.py index 8c2c6956f8..8cc1d59335 100644 --- a/tryton/gui/window/view_form/view/list_gtk/editabletree.py +++ b/tryton/gui/window/view_form/view/list_gtk/editabletree.py @@ -307,9 +307,11 @@ class EditableTreeView(TreeView): text = entry.props.value elif isinstance(entry, Gtk.ComboBox): model = entry.get_model() - text = model.get_value( - entry.get_active_iter(), - entry.props.entry_text_column) + iter_ = entry.get_active_iter() + if iter_: + text = model.get_value(iter_, entry.props.entry_text_column) + else: + text = '' else: text = entry.get_text() self.on_quit_cell(record, column, renderer, text)