Reviewers: ,
Please review this at http://codereview.tryton.org/222004/
Affected files:
M tryton/gui/window/view_form/model/field.py
Index: tryton/gui/window/view_form/model/field.py
===================================================================
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -303,9 +303,6 @@
value = record.parent.id if record.parent else False
if value:
if isinstance(value, (int, basestring, long)):
- self.set(record, value)
- value = record.value.get(self.name, value)
- if isinstance(value, (int, basestring, long)):
return value
return value[0] or False
return False
@@ -328,10 +325,15 @@
if (record.parent_name == self.name
and self.attrs['relation'] ==
record.group.parent.model_name):
if record.parent:
- if 'rec_name' in record.parent.value:
- value = (record.parent.id,
record.parent.value['rec_name'])
+ if isinstance(value, (int, long)):
+ test_value = value
else:
- value = record.parent.id
+ test_value = value[0]
+ if test_value != record.parent.id:
+ if 'rec_name' in record.parent.value:
+ value = (record.parent.id,
record.parent.value['rec_name'])
+ else:
+ value = record.parent.id
else:
value = False
if value and isinstance(value, (int, long)) and value >= 0:
--
[email protected] mailing list
