[IMP] fields: removed any reference to integer_big.
bzr revid: vmt@openerp.com-20120322163850-sxfd9g1x96jstr51
This commit is contained in:
parent
c5ef5e1394
commit
46a190aaf8
|
@ -55,7 +55,7 @@ class ir_property(osv.osv):
|
||||||
'fields_id': fields.many2one('ir.model.fields', 'Field', ondelete='cascade', required=True, select=1),
|
'fields_id': fields.many2one('ir.model.fields', 'Field', ondelete='cascade', required=True, select=1),
|
||||||
|
|
||||||
'value_float' : fields.float('Value'),
|
'value_float' : fields.float('Value'),
|
||||||
'value_integer' : fields.integer_big('Value'), # will contain (int, bigint)
|
'value_integer' : fields.integer('Value')
|
||||||
'value_text' : fields.text('Value'), # will contain (char, text)
|
'value_text' : fields.text('Value'), # will contain (char, text)
|
||||||
'value_binary' : fields.binary('Value'),
|
'value_binary' : fields.binary('Value'),
|
||||||
'value_reference': fields.reference('Value', selection=_models_get2, size=128),
|
'value_reference': fields.reference('Value', selection=_models_get2, size=128),
|
||||||
|
@ -65,7 +65,6 @@ class ir_property(osv.osv):
|
||||||
('float', 'Float'),
|
('float', 'Float'),
|
||||||
('boolean', 'Boolean'),
|
('boolean', 'Boolean'),
|
||||||
('integer', 'Integer'),
|
('integer', 'Integer'),
|
||||||
('integer_big', 'Integer Big'),
|
|
||||||
('text', 'Text'),
|
('text', 'Text'),
|
||||||
('binary', 'Binary'),
|
('binary', 'Binary'),
|
||||||
('many2one', 'Many2One'),
|
('many2one', 'Many2One'),
|
||||||
|
@ -100,7 +99,6 @@ class ir_property(osv.osv):
|
||||||
'float': 'value_float',
|
'float': 'value_float',
|
||||||
'boolean' : 'value_integer',
|
'boolean' : 'value_integer',
|
||||||
'integer': 'value_integer',
|
'integer': 'value_integer',
|
||||||
'integer_big': 'value_integer',
|
|
||||||
'text': 'value_text',
|
'text': 'value_text',
|
||||||
'binary': 'value_binary',
|
'binary': 'value_binary',
|
||||||
'many2one': 'value_reference',
|
'many2one': 'value_reference',
|
||||||
|
@ -142,7 +140,7 @@ class ir_property(osv.osv):
|
||||||
return record.value_float
|
return record.value_float
|
||||||
elif record.type == 'boolean':
|
elif record.type == 'boolean':
|
||||||
return bool(record.value_integer)
|
return bool(record.value_integer)
|
||||||
elif record.type in ('integer', 'integer_big'):
|
elif record.type == 'integer':
|
||||||
return record.value_integer
|
return record.value_integer
|
||||||
elif record.type == 'binary':
|
elif record.type == 'binary':
|
||||||
return record.value_binary
|
return record.value_binary
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
<separator colspan="4" string="Field Information"/>
|
<separator colspan="4" string="Field Information"/>
|
||||||
<field colspan="4" name="fields_id" select="1"/>
|
<field colspan="4" name="fields_id" select="1"/>
|
||||||
<field colspan="4" name="type"/>
|
<field colspan="4" name="type"/>
|
||||||
<group colspan="4" attrs="{'invisible' : [('type', 'not in', ('integer', 'integer_big', 'boolean'))]}">
|
<group colspan="4" attrs="{'invisible' : [('type', 'not in', ('integer', 'boolean'))]}">
|
||||||
<field colspan="4" name="value_integer" widget="integer"/>
|
<field colspan="4" name="value_integer" widget="integer"/>
|
||||||
</group>
|
</group>
|
||||||
<group colspan="4" attrs="{'invisible' : [('type', '!=', 'float')]}">
|
<group colspan="4" attrs="{'invisible' : [('type', '!=', 'float')]}">
|
||||||
|
|
|
@ -1011,7 +1011,7 @@ class function(_column):
|
||||||
self._symbol_f = boolean._symbol_f
|
self._symbol_f = boolean._symbol_f
|
||||||
self._symbol_set = boolean._symbol_set
|
self._symbol_set = boolean._symbol_set
|
||||||
|
|
||||||
if type in ['integer','integer_big']:
|
if type == 'integer':
|
||||||
self._symbol_c = integer._symbol_c
|
self._symbol_c = integer._symbol_c
|
||||||
self._symbol_f = integer._symbol_f
|
self._symbol_f = integer._symbol_f
|
||||||
self._symbol_set = integer._symbol_set
|
self._symbol_set = integer._symbol_set
|
||||||
|
@ -1051,7 +1051,7 @@ class function(_column):
|
||||||
elif not context.get('bin_raw'):
|
elif not context.get('bin_raw'):
|
||||||
result = sanitize_binary_value(value)
|
result = sanitize_binary_value(value)
|
||||||
|
|
||||||
if field_type in ("integer","integer_big") and value > xmlrpclib.MAXINT:
|
if field_type == "integer" and value > xmlrpclib.MAXINT:
|
||||||
# integer/long values greater than 2^31-1 are not supported
|
# integer/long values greater than 2^31-1 are not supported
|
||||||
# in pure XMLRPC, so we have to pass them as floats :-(
|
# in pure XMLRPC, so we have to pass them as floats :-(
|
||||||
# This is not needed for stored fields and non-functional integer
|
# This is not needed for stored fields and non-functional integer
|
||||||
|
|
|
@ -544,7 +544,6 @@ def pg_varchar(size=0):
|
||||||
FIELDS_TO_PGTYPES = {
|
FIELDS_TO_PGTYPES = {
|
||||||
fields.boolean: 'bool',
|
fields.boolean: 'bool',
|
||||||
fields.integer: 'int4',
|
fields.integer: 'int4',
|
||||||
fields.integer_big: 'int8',
|
|
||||||
fields.text: 'text',
|
fields.text: 'text',
|
||||||
fields.date: 'date',
|
fields.date: 'date',
|
||||||
fields.datetime: 'timestamp',
|
fields.datetime: 'timestamp',
|
||||||
|
|
Loading…
Reference in New Issue