openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-core-config-ysa into lp:~openobject-training/openobject-addons/training.

Requested reviews:
  OpenObject Training (openobject-training)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-core-config-ysa/+merge/55878

core_config :- convert this module into v6.

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-core-config-ysa/+merge/55878
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-core-config-ysa.

=== modified file 'core_config/__init__.py'
--- core_config/__init__.py	2011-03-16 10:05:03 +0000
+++ core_config/__init__.py	2011-04-01 08:32:36 +0000
@@ -22,3 +22,5 @@
 ##############################################################################
 
 import ir_config
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'core_config/__terp__.py' => 'core_config/__openerp__.py'
--- core_config/__terp__.py	2011-03-16 10:05:03 +0000
+++ core_config/__openerp__.py	2011-04-01 08:32:36 +0000
@@ -37,3 +37,6 @@
     "active": False,
     "installable": True
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== modified file 'core_config/ir_config.py'
--- core_config/ir_config.py	2011-03-31 10:38:02 +0000
+++ core_config/ir_config.py	2011-04-01 08:32:36 +0000
@@ -21,7 +21,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 from tools.translate import _
 from tools.misc import cache
 
@@ -40,9 +41,9 @@
         ]
 
     _columns = {
-        'name': fields.char('Name', size=255, select=1, readonly=True),
-        'type': fields.selection(_get_type_selection, 'Type', select=1, required=True, readonly=True),
-        'value': fields.char('Value', size=64, select=1),
+        'name': fields.char('Name', size=255, readonly=True),
+        'type': fields.selection(_get_type_selection, 'Type', required=True, readonly=True),
+        'value': fields.char('Value', size=64),
         'default_value': fields.char('Default Value', size=64, readonly=True),
         'description': fields.text('Description', readonly=True, translate=True),
     }
@@ -97,15 +98,25 @@
         return False
 
     def reset_default_values(self, cr, uid, ids, context=None):
-        default_values = self.read(cr, uid, ids, ['default_value'])
+        if context is None:
+            context = {}
+        default_values = self.read(cr, uid, ids, ['default_value'], context=context)
         for default_value in default_values:
             self.write(cr, uid, [default_value['id']],
+<<<<<<< TREE
                        {'value': default_value['default_value']})
         return False
     
+=======
+                       {'value': default_value['default_value']}, context=context)
+        return True
+
+>>>>>>> MERGE-SOURCE
     def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
         if 'value' in vals.keys():
-            for option in self.read(cr, uid, ids, []):
+            for option in self.read(cr, uid, ids, [], context=context):
                 optname_validate = 'validate_'+option['name'].replace('.','_')
                 opttype_validate = 'validate_type_'+option['type']
                 try:
@@ -133,17 +144,22 @@
         """default validation methods for integer option
            @raise osv.except_osv in case of an error
         """
+        if context is None:
+            context = {}
         if 'default_value' in vals.keys():
             if not vals['default_value'].isdigit():
                 raise osv.except_osv(_('Error'), _('The dafault value must be a integer.'))
         if 'value' in vals.keys():
             if not vals['value'].isdigit():
                 raise osv.except_osv(_('Error'), _('The value must be a integer.'))
+        return True
 
     def validate_type_float(self, cr, uid, option, vals, context=None):
         """default validation methods for float option
            @raise osv.except_osv in case of an error
         """
+        if context is None:
+            context = {}
         if 'default_value' in vals.keys():
             try:
                 float(vals['default_value'])
@@ -154,18 +170,23 @@
                 float(vals['value'])
             except ValueError:
                 raise osv.except_osv(_('Error'), _('The value must be a float.'))
+        return True
 
     def validate_type_boolean(self, cr, uid, option, vals, context=None):
         """default validation methods for boolean option
            @raise osv.except_osv in case of an error
         """
+        if context is None:
+            context = {}
         if 'default_value' in vals.keys():
             if not vals['default_value'] in ['0', '1', '']:
                 raise osv.except_osv(_('Error'), _('The dafault value must be a boolean.'))
         if 'value' in vals.keys():
             if not vals['value'] in ['0', '1', '']:
                 raise osv.except_osv(_('Error'), _('The value must be a boolean.'))
+        return True
 
 
 ir_config()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'core_config/ir_config_view.xml'
--- core_config/ir_config_view.xml	2011-03-16 10:05:03 +0000
+++ core_config/ir_config_view.xml	2011-04-01 08:32:36 +0000
@@ -16,6 +16,19 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_ir_config_search">
+            <field name="name">ir.config.search</field>
+            <field name="model">ir.config</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Database config option">
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="value"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_ir_config_form">
             <field name="name">ir.config.form</field>
             <field name="model">ir.config</field>
@@ -43,6 +56,7 @@
             <field name="res_model">ir.config</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_ir_config_form"/>
+            <field name="search_view_id" ref="view_ir_config_search"/>
         </record>
         <record model="ir.actions.act_window.view" id="action_ir_config_tree">
             <field name="sequence" eval="10"/>