Use empty text for empty Reference in editable tree

issue9052
review291491002
This commit is contained in:
Cédric Krier committed 2020-04-24 21:55:30 +02:00
1 parent 0efd5af638
commit b8ab5b8d4a
2 files changed
+7 -5

No files matched your search

+2 -2
View File
@@ -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
@@ -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)