# HG changeset patch # User RĂ©mi Cardona # Date 1395326543 -3600 # Node ID 283503f58400e35f74ca1674afea576808be3d27 # Parent 501f14e095d102520703907643086daa62c064f3 [cwconfig] Remove useless 'ui-cube' configuration option (closes #3728904) The mechanism introduced could never actually be used as it brings dependency loops to the cube graph. Just get rid of it. This reverts commit 4032499c701e. diff -r 501f14e095d1 -r 283503f58400 cwconfig.py --- a/cwconfig.py Mon Apr 07 14:28:47 2014 +0200 +++ b/cwconfig.py Thu Mar 20 15:42:23 2014 +0100 @@ -554,27 +554,19 @@ todo.append(depcube) return cubes - def reorder_cubes(self, cubes): + @classmethod + def reorder_cubes(cls, cubes): """reorder cubes from the top level cubes to inner dependencies cubes """ from logilab.common.graph import ordered_nodes, UnorderableGraph - # See help string for 'ui-cube' in web/webconfig.py for the reasons - # behind this hack. - uicube = self.get('ui-cube', None) graph = {} - if uicube: - graph[uicube] = set() for cube in cubes: cube = CW_MIGRATION_MAP.get(cube, cube) - graph[cube] = set(dep for dep in self.cube_dependencies(cube) + graph[cube] = set(dep for dep in cls.cube_dependencies(cube) if dep in cubes) - graph[cube] |= set(dep for dep in self.cube_recommends(cube) + graph[cube] |= set(dep for dep in cls.cube_recommends(cube) if dep in cubes) - if uicube and cube != uicube \ - and cube not in self.cube_dependencies(uicube) \ - and cube not in self.cube_recommends(uicube): - graph[cube].add(uicube) try: return ordered_nodes(graph) except UnorderableGraph as ex: diff -r 501f14e095d1 -r 283503f58400 web/webconfig.py --- a/web/webconfig.py Mon Apr 07 14:28:47 2014 +0200 +++ b/web/webconfig.py Thu Mar 20 15:42:23 2014 +0100 @@ -111,14 +111,6 @@ 'group': 'web', 'level': 3, }), # web configuration - ('ui-cube', - {'type' : 'string', - 'default': None, - 'help': 'the name of the UI cube that will be loaded before all other '\ - 'cubes. Setting this value to None will instruct cubicweb not to load '\ - 'any extra cube.', - 'group': 'web', 'level': 3, - }), ('https-url', {'type' : 'string', 'default': None,