Merge lp:~openerp-dev/openobject-server/trunk-bug-1100065-ishwar into lp:openobject-server

[Ishwar Malvi(OpenERP)]

Hello,

      I have fixed a problem of customize view.

Thanks,
Ishwar Malvi

[Vo Minh Thu (thu)]

It seems as your fix would work but it would be better to not change ir.ui.view's fields_view_get directly in ir_ui_view.py, but instead do something similar to the `board` module.

I.e. all the code for the custom views used in `base` and `board` should be inside some new module (which would be a dependency for `board`). I will create a task for that, see if it could get some love.

Unmerged revisions

4842. By Ishwar Malvi(OpenERP) on 2013-03-28

[FIX] customize view problem

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2013-03-25 14:32:56 +0000
+++ openerp/osv/orm.py	2013-03-28 10:20:36 +0000
@@ -2209,15 +2209,22 @@
                         view_id = view_ref_res[0]
 
             if view_id:
-                cr.execute("""SELECT arch,name,field_parent,id,type,inherit_id,model
+                cr.execute("""SELECT original.id AS id,custom.user_id AS user_id,custom.arch AS arch,original.name AS name,original.field_parent AS field_parent,original.type AS type,original.inherit_id AS inherit_id,original.model AS model
+                        FROM ir_ui_view_custom custom 
+                        INNER JOIN ir_ui_view original ON custom.ref_id = original.id 
+                        WHERE custom.user_id=%s AND custom.ref_id=%s""", (user,view_id,))
+                sql_res = cr.dictfetchone()
+                if not sql_res:
+                    cr.execute("""SELECT arch,name,field_parent,id,type,inherit_id,model
                               FROM ir_ui_view
                               WHERE id=%s""", (view_id,))
+                    sql_res = cr.dictfetchone()
             else:
                 cr.execute("""SELECT arch,name,field_parent,id,type,inherit_id,model
                               FROM ir_ui_view
                               WHERE model=%s AND type=%s AND inherit_id IS NULL
                               ORDER BY priority""", (self._name, view_type))
-            sql_res = cr.dictfetchone()
+                sql_res = cr.dictfetchone()
 
             if not sql_res:
                 break