From ca0023f8af1cd0f490e1f6bbe78e43e2ab1fba32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 12 Mar 2014 15:18:06 +0100 Subject: [PATCH] Fix name collision between PopdownMixin and Reference widget get_model is already used in Reference widget inherited from the Many2One widget. So it is renamed into get_popdown_model. --- tryton/common/selection.py | 4 ++-- tryton/gui/window/view_form/view/list_gtk/parser.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tryton/common/selection.py b/tryton/common/selection.py index ca1eb64317..d5bbe69b22 100644 --- a/tryton/common/selection.py +++ b/tryton/common/selection.py @@ -112,7 +112,7 @@ class PopdownMixin(object): def set_popdown(self, selection, entry): if not entry.child: # entry is destroyed return - model, lengths = self.get_model(selection) + model, lengths = self.get_popdown_model(selection) entry.set_model(model) # GTK 2.24 and above use a ComboBox instead of a ComboBoxEntry if hasattr(entry, 'set_text_column'): @@ -137,7 +137,7 @@ class PopdownMixin(object): completion.set_text_column(0) completion.connect('match-selected', self.match_selected, entry) - def get_model(self, selection): + def get_popdown_model(self, selection): model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) lengths = [] for (value, name) in selection: diff --git a/tryton/gui/window/view_form/view/list_gtk/parser.py b/tryton/gui/window/view_form/view/list_gtk/parser.py index fc637f715b..b707a30707 100644 --- a/tryton/gui/window/view_form/view/list_gtk/parser.py +++ b/tryton/gui/window/view_form/view/list_gtk/parser.py @@ -929,7 +929,7 @@ class Selection(Char, SelectionMixin, PopdownMixin): self.renderer = CellRendererCombo() self.renderer.connect('editing-started', self.editing_started) self.init_selection() - self.renderer.set_property('model', self.get_model(self.selection)[0]) + self.renderer.set_property('model', self.get_popdown_model(self.selection)[0]) self.renderer.set_property('text-column', 0) def get_textual_value(self, record):