file based openerp views

bzr revid: al@openerp.com-20130620221648-kj53t7vdopfab0c2

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index fcb5c2d..dac6cc3 100644 (file)
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -27,11 +27,13 @@ import os
 import time
 
 from openerp import tools
+from openerp.modules import module
 from openerp.osv import fields, osv, orm
 from openerp.tools import graph, SKIPPED_ELEMENT_TYPES
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 from openerp.tools.view_validation import valid_view
+from openerp.tools import misc
 
 _logger = logging.getLogger(__name__)
 
@@ -66,6 +68,32 @@ class view(osv.osv):
                 result[record.id] = etree.fromstring(record.arch.encode('utf8')).tag
         return result
 
+    def _arch_get(self, cr, uid, ids, name, arg, context=None):
+        """
+        For each id being read, return arch_db or the content of arch_file
+        """
+        result = {}
+        for record in self.read(cr, uid, ids, ['arch_file', 'arch_db'], context=context):
+            if record['arch_db']:
+                result[record['id']] = record['arch_db']
+                continue
+
+            view_module, path = record['arch_file'].split('/', 1)
+            arch_path = module.get_module_resource(view_module, path)
+            if not arch_path:
+                raise IOError("No file '%s' in module '%s'" % (path, view_module))
+
+            with misc.file_open(arch_path) as f:
+                result[record['id']] = f.read().decode('utf-8')
+
+        return result
+
+    def _arch_set(self, cr, uid, id, name, value, arg, context=None):
+        """
+        Forward writing to arch_db
+        """
+        self.write(cr, uid, id, {'arch_db': value}, context=context)
+
     _columns = {
         'name': fields.char('View Name', required=True),
         'model': fields.char('Object', size=64, select=True),
@@ -80,7 +108,9 @@ class view(osv.osv):
             ('gantt', 'Gantt'),
             ('kanban', 'Kanban'),
             ('search','Search')], string='View Type', select=True, store=True),
-        'arch': fields.text('View Architecture', required=True),
+        'arch_file': fields.char("View path"),
+        'arch_db': fields.text("Arch content", oldname='arch'),
+        'arch': fields.function(_arch_get, fnct_inv=_arch_set, store=False, string="View Architecture", type='text', nodrop=True),
         'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True),
         'field_parent': fields.char('Child Field',size=64),
         'xml_id': fields.function(osv.osv.get_xml_id, type='char', size=128, string="External ID",

diff --git a/openerp/addons/base/ir/ir_ui_view_view.xml b/openerp/addons/base/ir/ir_ui_view_view.xml
index 44594c1..6ae2cdc 100644 (file)
--- a/openerp/addons/base/ir/ir_ui_view_view.xml
+++ b/openerp/addons/base/ir/ir_ui_view_view.xml
@@ -15,6 +15,7 @@
                             <field name="priority"/>
                         </group>
                         <group>
+                            <field name="arch_file"/>
                             <field name="field_parent"/>
                             <field name="inherit_id"/>
                             <field name="xml_id"/>

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index e3c5311..893a7af 100644 (file)
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -615,9 +615,8 @@ form: module.record_id""" % (xml_id,)
                     "Verify that this is a window action or add a type argument." % (a_action,)
                 action_type,action_mode,action_name,view_id,target = rrres
                 if view_id:
-                    cr.execute('SELECT arch FROM ir_ui_view WHERE id=%s', (int(view_id),))
-                    arch, = cr.fetchone()
-                    action_mode = etree.fromstring(arch.encode('utf8')).tag
+                    view_arch = self.pool['ir.ui.view'].read(cr, 1, [view_id], ['arch'])
+                    action_mode = etree.fromstring(view_arch[0]['arch'].encode('utf8')).tag
                 cr.execute('SELECT view_mode FROM ir_act_window_view WHERE act_window_id=%s ORDER BY sequence LIMIT 1', (int(a_id),))
                 if cr.rowcount:
                     action_mode, = cr.fetchone()