credativ team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/openupgrade-server/6.1-lp933781_action_attrs_is_undefined into lp:openupgrade-server.

Requested reviews:
  Simon Vass (svass): could you perhaps run a test upgrade?
Related bugs:
  Bug #933781 in OpenUpgrade Server: "[6.1 trunk] action_attrs is undefined"
  https://bugs.launchpad.net/openupgrade-server/+bug/933781

For more details, see:
https://code.launchpad.net/~therp-nl/openupgrade-server/6.1-lp933781_action_attrs_is_undefined/+merge/128346
-- 
https://code.launchpad.net/~therp-nl/openupgrade-server/6.1-lp933781_action_attrs_is_undefined/+merge/128346
Your team OpenUpgrade Committers is subscribed to branch lp:openupgrade-server.

=== modified file 'openerp/addons/base/migrations/6.1.1.3/post-migration.py'
--- openerp/addons/base/migrations/6.1.1.3/post-migration.py	2012-06-21 12:09:48 +0000
+++ openerp/addons/base/migrations/6.1.1.3/post-migration.py	2012-10-06 08:27:23 +0000
@@ -18,6 +18,7 @@
         ]
     }
 
+<<<<<<< TREE
 def mark_obsolete_modules(cr):
     """
     Remove modules that are known to be obsolete
@@ -36,7 +37,30 @@
         (tuple(obsolete_modules),))
 
 @openupgrade.migrate()
+=======
+def fix_client_actions(cr):
+    """
+    Fix up ir.action.client actions:
+    see https://bugs.launchpad.net/openerp-web/+bug/933781
+    Solution by Stuart Longland
+    """
+    openupgrade.logged_query(cr, """
+        INSERT INTO ir_actions (
+            id, name, type
+        ) SELECT id,
+                 name,
+                 type
+          FROM ir_act_client
+          WHERE id NOT IN (
+              SELECT id
+              FROM ir_actions
+              WHERE type='ir.actions.client'
+                );
+        """)
+
+>>>>>>> MERGE-SOURCE
 def migrate(cr, version):
+<<<<<<< TREE
     pool = pooler.get_pool(cr.dbname)
     openupgrade.set_defaults(cr, pool, force_defaults, force=True)
     openupgrade.load_data(cr, 'base', 'migrations/6.1.1.3/data/base_data.xml')
@@ -50,3 +74,22 @@
         (select res_id from ir_model_data where model='ir.module.category')
     """)
     mark_obsolete_modules(cr)     
+=======
+    try:
+        logger.info("%s called", me)
+        pool = pooler.get_pool(cr.dbname)
+        openupgrade.set_defaults(cr, pool, force_defaults, force=True)
+        openupgrade.load_data(cr, 'base', 'migrations/6.1.1.3/data/base_data.xml')
+        openupgrade.load_data(cr, 'base', 'migrations/6.1.1.3/data/base_security.xml')
+        openupgrade.load_data(cr, 'base', 'migrations/6.1.1.3/data/ir.model.access.csv')
+        fix_client_actions(cr)
+        #force recreating module categories for all categories without xmlid
+        #this fixes addons getting wrong category_ids assigned in case of
+        #multiple categories with the same name
+        cr.execute("""
+            delete from ir_module_category where id not in 
+            (select res_id from ir_model_data where model='ir.module.category')
+        """)
+    except Exception, e:
+        raise osv.except_osv("OpenUpgrade", '%s: %s' % (me, e))
+>>>>>>> MERGE-SOURCE