# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1284389212 -7200
# Node ID dbb7ad04b963675852dc8ad69926c51965dcd99e
# Parent  1f4beef3962d3ac568a86e9eed8ec4aceb378b21# Parent  21772f4e41d9a83560507cdf454472490c2a42c1
merge stable heads

diff -r 1f4beef3962d -r dbb7ad04b963 migration.py
--- a/migration.py	Mon Sep 13 14:48:29 2010 +0200
+++ b/migration.py	Mon Sep 13 16:46:52 2010 +0200
@@ -359,7 +359,7 @@
             import doctest
             doctest.testfile(migrscript, module_relative=False,
                              optionflags=doctest.ELLIPSIS, globs=scriptlocals)
-        del self._context_stack[-1]
+        self._context_stack.pop()
 
     def cmd_option_renamed(self, oldname, newname):
         """a configuration option has been renamed"""
@@ -390,10 +390,8 @@
             cubes = (cubes,)
         origcubes = self.config.cubes()
         newcubes = [p for p in self.config.expand_cubes(cubes)
-                       if not p in origcubes]
+                    if not p in origcubes]
         if newcubes:
-            for cube in cubes:
-                assert cube in newcubes
             self.config.add_cubes(newcubes)
         return newcubes
 
diff -r 1f4beef3962d -r dbb7ad04b963 misc/migration/3.6.0_Any.py
--- a/misc/migration/3.6.0_Any.py	Mon Sep 13 14:48:29 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-sync_schema_props_perms('read_permission', syncperms=False) # fix read_permission cardinality
diff -r 1f4beef3962d -r dbb7ad04b963 misc/migration/bootstrapmigration_repository.py
--- a/misc/migration/bootstrapmigration_repository.py	Mon Sep 13 14:48:29 2010 +0200
+++ b/misc/migration/bootstrapmigration_repository.py	Mon Sep 13 16:46:52 2010 +0200
@@ -35,9 +35,6 @@
     ss.execschemarql(rql, rdef, ss.rdef2rql(rdef, CSTRMAP, groupmap=None))
     commit(ask_confirm=False)
 
-if applcubicwebversion < (3, 9, 6) and cubicwebversion >= (3, 9, 6):
-    add_entity_type('CWUniqueTogetherConstraint')
-
 if applcubicwebversion == (3, 6, 0) and cubicwebversion >= (3, 6, 0):
     CSTRMAP = dict(rql('Any T, X WHERE X is CWConstraintType, X name T',
                        ask_confirm=False))
@@ -95,6 +92,10 @@
         for action in ('read', 'add', 'delete'):
             drop_relation_definition('CWRType', '%s_permission' % action, 'CWGroup', commit=False)
             drop_relation_definition('CWRType', '%s_permission' % action, 'RQLExpression')
+    sync_schema_props_perms('read_permission', syncperms=False) # fix read_permission cardinality
+
+if applcubicwebversion < (3, 9, 6) and cubicwebversion >= (3, 9, 6):
+    add_entity_type('CWUniqueTogetherConstraint')
 
 if applcubicwebversion < (3, 4, 0) and cubicwebversion >= (3, 4, 0):
 
diff -r 1f4beef3962d -r dbb7ad04b963 web/data/cubicweb.htmlhelpers.js
--- a/web/data/cubicweb.htmlhelpers.js	Mon Sep 13 14:48:29 2010 +0200
+++ b/web/data/cubicweb.htmlhelpers.js	Mon Sep 13 16:46:52 2010 +0200
@@ -88,7 +88,7 @@
  * toggle visibility of an element by its id
  */
 function toggleVisibility(elemId) {
-    $('#' + elemId).toggleClass('hidden');
+    cw.jqNode(elemId).toggleClass('hidden');
 }
 
 /**