From 39d514678cdf26fb131745c2d733bcd202b1b0cf Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 11:56:36 +0100
Subject: [imp] repaired illogic al's code

bzr revid: nicolas.vanhoren@openerp.com-20120217105636-61tk67zbx9calc1b
---
 addons/web/controllers/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index eaf3d671874..3fbb943342f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -103,7 +103,9 @@ html_template = """<!DOCTYPE html>
         <script type="text/javascript">
             $(function() {
                 var s = new openerp.init(%(modules)s);
-                %(init)s
+                var wc = new s.web.WebClient();
+                wc.$element = $(document.body);
+                wc.start();
             });
         </script>
     </head>
@@ -270,7 +272,6 @@ class WebClient(openerpweb.Controller):
             'js': js,
             'css': css,
             'modules': simplejson.dumps(self.server_wide_modules(req)),
-            'init': 'new s.web.WebClient().start();',
         }
         return r
 
-- 
cgit v1.2.3


From feaade623ab11807b837dbf392608f9df25dd930 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 17 Feb 2012 12:01:52 +0100
Subject: [imp] put openerp into body

bzr revid: nicolas.vanhoren@openerp.com-20120217110152-x66rfhyfkqao04k0
---
 addons/web/controllers/main.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3fbb943342f..2fa9a38a82b 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -104,12 +104,11 @@ html_template = """<!DOCTYPE html>
             $(function() {
                 var s = new openerp.init(%(modules)s);
                 var wc = new s.web.WebClient();
-                wc.$element = $(document.body);
-                wc.start();
+                wc.appendTo($(document.body));
             });
         </script>
     </head>
-    <body class="openerp" id="oe"></body>
+    <body></body>
 </html>
 """
 
-- 
cgit v1.2.3


From 8036408be55ab9ff3a5b1b6bf1b6241236277b8e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 20 Feb 2012 10:52:38 +0100
Subject: [imp] made the body css properties be included only in full
 web-client mode

bzr revid: nicolas.vanhoren@openerp.com-20120220095238-lxwtctbpo46ekpul
---
 addons/web/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2fa9a38a82b..c87439fd78b 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -98,6 +98,7 @@ html_template = """<!DOCTYPE html>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <title>OpenERP</title>
         <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
+        <link rel="stylesheet" href="/web/static/src/css/full.css" />
         %(css)s
         %(js)s
         <script type="text/javascript">
-- 
cgit v1.2.3


From a0493e2e483d8a47a70029081af659232cc4970a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 21 Feb 2012 19:58:53 +0100
Subject: [FIX] database get_list use wsgi hostname

bzr revid: al@openerp.com-20120221185853-6qjxwktk7pnehz9w
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index c87439fd78b..9f113dac970 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -352,7 +352,7 @@ class Database(openerpweb.Controller):
     def get_list(self, req):
         proxy = req.session.proxy("db")
         dbs = proxy.list()
-        h = req.httprequest.headers['Host'].split(':')[0]
+        h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
         d = h.split('.')[0]
         r = req.config.dbfilter.replace('%h', h).replace('%d', d)
         dbs = [i for i in dbs if re.match(r, i)]
-- 
cgit v1.2.3


From bfee2b7ae2682087942a49940c00729b0ef6af42 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 21 Feb 2012 19:57:39 +0100
Subject: [FIX] database get_list use wsgi hostname

bzr revid: al@openerp.com-20120221185739-7utcld4kcnf39fg5
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index eaf3d671874..cfb87a04021 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -351,7 +351,7 @@ class Database(openerpweb.Controller):
     def get_list(self, req):
         proxy = req.session.proxy("db")
         dbs = proxy.list()
-        h = req.httprequest.headers['Host'].split(':')[0]
+        h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
         d = h.split('.')[0]
         r = req.config.dbfilter.replace('%h', h).replace('%d', d)
         dbs = [i for i in dbs if re.match(r, i)]
-- 
cgit v1.2.3


From 12825e4122adc2dd38df145db9426c2ec6ff7f03 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 14:46:12 +0100
Subject: [FIX] correctly handle the user's menu_id being set to an action with
 domain=False (literally)

that's a bit stupid, but apparently people do set their menu action to a dashboard...

lp bug: https://launchpad.net/bugs/937691 fixed

bzr revid: xmo@openerp.com-20120223134612-3sm2e4yq3hbjqnz7
---
 addons/web/controllers/main.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index cfb87a04021..47f3837f018 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -762,11 +762,13 @@ class Menu(openerpweb.Controller):
         Menus = s.model('ir.ui.menu')
         # If a menu action is defined use its domain to get the root menu items
         user_menu_id = s.model('res.users').read([s._uid], ['menu_id'], context)[0]['menu_id']
+
+        menu_domain = [('parent_id', '=', False)]
         if user_menu_id:
-            menu_domain = s.model('ir.actions.act_window').read([user_menu_id[0]], ['domain'], context)[0]['domain']
-            menu_domain = ast.literal_eval(menu_domain)
-        else:
-            menu_domain = [('parent_id', '=', False)]
+            domain_string = s.model('ir.actions.act_window').read([user_menu_id[0]], ['domain'], context)[0]['domain']
+            if domain_string:
+                menu_domain = ast.literal_eval(domain_string)
+
         return Menus.search(menu_domain, 0, False, False, context)
 
     def do_load(self, req):
-- 
cgit v1.2.3


From 73becbfe0bf721a1e0aac50f8977695ff20a0d29 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 24 Feb 2012 00:48:06 +0100
Subject: [IMP] sass2scss taken from ~cto-openerp/+junk/sass2scss with minor
 cleanups

bzr revid: al@openerp.com-20120223234806-8tg83pph08dsvqie
---
 addons/web/controllers/main.py | 51 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 9f113dac970..623b297233b 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -113,6 +113,57 @@ html_template = """<!DOCTYPE html>
 </html>
 """
 
+def sass2scss(src):
+    # Validated by diff -u of sass2scss against:
+    # sass-convert -F sass -T scss openerp.sass openerp.scss
+    block = []
+    sass = ('', block)
+    reComment = re.compile(r'//.*$')
+    reIndent = re.compile(r'^\s+')
+    reIgnore = re.compile(r'^\s*(//.*)?$')
+    reFixes = { re.compile(r'\(\((.*)\)\)') : r'(\1)', }
+    lastLevel = 0
+    prevBlocks = {}
+    for l in src.split('\n'):
+        l = l.rstrip()
+        if reIgnore.search(l): continue
+        l = reComment.sub('', l)
+        l = l.rstrip()
+        indent = reIndent.match(l)
+        level = indent.end() if indent else 0
+        l = l[level:]
+        if level>lastLevel:
+            prevBlocks[lastLevel] = block
+            newBlock = []
+            block[-1] = (block[-1], newBlock)
+            block = newBlock
+        elif level<lastLevel:
+            block = prevBlocks[level]
+        lastLevel = level
+        if not l: continue
+        # Fixes
+        for ereg, repl in reFixes.items():
+            l = ereg.sub(repl if type(repl)==str else repl(), l)
+        block.append(l)
+
+    def write(sass, level=-1):
+        out = ""
+        indent = '  '*level
+        if type(sass)==tuple:
+            if level>=0:
+                out += indent+sass[0]+" {\n"
+            for e in sass[1]:
+                out += write(e, level+1)
+            if level>=0:
+                out = out.rstrip(" \n")
+                out += ' }\n'
+            if level==0:
+                out += "\n"
+        else:
+            out += indent+sass+";\n"
+        return out
+    return write(sass)
+
 class WebClient(openerpweb.Controller):
     _cp_path = "/web/webclient"
 
-- 
cgit v1.2.3


From e7f72af654dbfa59ed8fc853911a1e7381a2227e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 29 Feb 2012 10:53:45 +0100
Subject: [IMP] menu load action

bzr revid: al@openerp.com-20120229095345-ll5rbc3h4m7f29as
---
 addons/web/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 623b297233b..8e3dbfd344c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -832,13 +832,13 @@ class Menu(openerpweb.Controller):
         context = req.session.eval_context(req.context)
         Menus = req.session.model('ir.ui.menu')
 
-        menu_roots = Menus.read(self.do_get_user_roots(req), ['name', 'sequence', 'parent_id'], context)
+        menu_roots = Menus.read(self.do_get_user_roots(req), ['name', 'sequence', 'parent_id', 'action'], context)
         menu_root = {'id': False, 'name': 'root', 'parent_id': [-1, ''], 'children' : menu_roots}
 
         # menus are loaded fully unlike a regular tree view, cause there are a
         # limited number of items (752 when all 6.1 addons are installed)
         menu_ids = Menus.search([], 0, False, False, context)
-        menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id'], context)
+        menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id', 'action'], context)
         # adds roots at the end of the sequence, so that they will overwrite
         # equivalent menu items from full menu read when put into id:item
         # mapping, resulting in children being correctly set on the roots.
-- 
cgit v1.2.3


From 10ba2bb9b13a217d979c8575a293660a83573500 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 5 Mar 2012 15:29:48 +0100
Subject: [FIX] take dependencies in account when ordering modules for loading

bzr revid: xmo@openerp.com-20120305142948-2pkrgl8koizhcfbu
---
 addons/web/controllers/main.py | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 47f3837f018..367f1c9b30e 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -506,16 +506,31 @@ class Session(openerpweb.Controller):
         candidates = [mod for mod in loadable if mod not in loaded]
 
         # Compute active true modules that might be on the web side only
-        active = set(name for name in candidates
-                     if openerpweb.addons_manifest[name].get('active'))
+        modules = dict((name, openerpweb.addons_manifest[name].get('depends', []))
+                      for name in candidates
+                      if openerpweb.addons_manifest[name].get('active'))
 
         # Retrieve database installed modules
         Modules = req.session.model('ir.module.module')
-        installed = set(module['name'] for module in Modules.search_read(
-            [('state','=','installed'), ('name','in', candidates)], ['name']))
-
-        # Merge both
-        return list(active | installed)
+        modules.update((module['name'], module.get('depends',  []))
+             for module in Modules.search_read(
+                [('state','=','installed'), ('name','in', candidates)],
+                ['name', 'depends']))
+
+        ordered_mods = []
+        def insert(module):
+            # already inserted
+            if module in ordered_mods: return
+            # should be preloaded
+            if module not in modules: return
+            for name in modules[module]:
+                insert(name)
+            ordered_mods.append(module)
+
+        for name in modules:
+            insert(name)
+
+        return ordered_mods
 
     @openerpweb.jsonrequest
     def eval_domain_and_context(self, req, contexts, domains,
-- 
cgit v1.2.3


From 532e60a007c6ceff9c2938a6c7f765b90c75ce9e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 15:20:10 +0100
Subject: [FIX] dependencies handling in modules listing of web client

* Correctly fetch dependencies from server
* Switch topological sort to a more formal algorithm (and test it)

lp bug: https://launchpad.net/bugs/947161 fixed

bzr revid: xmo@openerp.com-20120306142010-zflycbrj4aq41mv3
---
 addons/web/controllers/main.py | 83 +++++++++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 21 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 367f1c9b30e..165641d8049 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -435,6 +435,50 @@ class Database(openerpweb.Controller):
                 return {'error': e.faultCode, 'title': 'Change Password'}
         return {'error': 'Error, password not changed !', 'title': 'Change Password'}
 
+def topological_sort(modules):
+    """ Return a list of module names sorted so that their dependencies of the
+    modules are listed before the module itself
+
+    modules is a dict of {module_name: dependencies}
+
+    :param modules: modules to sort
+    :type modules: dict
+    :returns: list(str)
+    """
+
+    dependencies = set(itertools.chain.from_iterable(modules.itervalues()))
+    # incoming edge: dependency on other module (if a depends on b, a has an
+    # incoming edge from b, aka there's an edge from b to a)
+    # outgoing edge: other module depending on this one
+
+    # [Tarjan 1976], http://en.wikipedia.org/wiki/Topological_sorting#Algorithms
+    #L ← Empty list that will contain the sorted nodes
+    L = []
+    #S ← Set of all nodes with no outgoing edges (modules on which no other
+    #    module depends)
+    S = set(module for module in modules if module not in dependencies)
+
+    visited = set()
+    #function visit(node n)
+    def visit(n):
+        #if n has not been visited yet then
+        if n not in visited:
+            #mark n as visited
+            visited.add(n)
+            #change: n not web module, can not be resolved, ignore
+            if n not in modules: return
+            #for each node m with an edge from m to n do (dependencies of n)
+            for m in modules[n]:
+                #visit(m)
+                visit(m)
+            #add n to L
+            L.append(n)
+    #for each node n in S do
+    for n in S:
+        #visit(n)
+        visit(n)
+    return L
+
 class Session(openerpweb.Controller):
     _cp_path = "/web/session"
 
@@ -502,35 +546,32 @@ class Session(openerpweb.Controller):
     def modules(self, req):
         # Compute available candidates module
         loadable = openerpweb.addons_manifest
-        loaded = req.config.server_wide_modules
+        loaded = set(req.config.server_wide_modules)
         candidates = [mod for mod in loadable if mod not in loaded]
 
+        # already installed modules have no dependencies
+        modules = dict.fromkeys(loaded, [])
+
         # Compute active true modules that might be on the web side only
-        modules = dict((name, openerpweb.addons_manifest[name].get('depends', []))
+        modules.update((name, openerpweb.addons_manifest[name].get('depends', []))
                       for name in candidates
                       if openerpweb.addons_manifest[name].get('active'))
 
         # Retrieve database installed modules
         Modules = req.session.model('ir.module.module')
-        modules.update((module['name'], module.get('depends',  []))
-             for module in Modules.search_read(
-                [('state','=','installed'), ('name','in', candidates)],
-                ['name', 'depends']))
-
-        ordered_mods = []
-        def insert(module):
-            # already inserted
-            if module in ordered_mods: return
-            # should be preloaded
-            if module not in modules: return
-            for name in modules[module]:
-                insert(name)
-            ordered_mods.append(module)
-
-        for name in modules:
-            insert(name)
-
-        return ordered_mods
+        for module in Modules.search_read(
+                        [('state','=','installed'), ('name','in', candidates)],
+                        ['name', 'dependencies_id']):
+            deps = module.get('dependencies_id')
+            if deps:
+                dependencies = map(
+                    operator.itemgetter('name'),
+                    req.session.model('ir.module.module.dependency').read(deps, ['name']))
+                modules[module['name']] = list(
+                    set(modules.get(module['name'], []) + dependencies))
+
+        sorted_modules = topological_sort(modules)
+        return [module for module in sorted_modules if module not in loaded]
 
     @openerpweb.jsonrequest
     def eval_domain_and_context(self, req, contexts, domains,
-- 
cgit v1.2.3


From 34b03bd24d8db9dcd36477b7e1076ae9b180870b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 6 Mar 2012 21:59:55 +0100
Subject: [FIX] Can't add to dashboard a view that includes a 'group_by'

lp bug: https://launchpad.net/bugs/948097 fixed

bzr revid: fme@openerp.com-20120306205955-zqgtbgtz1gtix4w9
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 165641d8049..71d01e2ef0a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1359,7 +1359,7 @@ class SearchView(View):
                 if board and 'arch' in board:
                     xml = ElementTree.fromstring(board['arch'])
                     column = xml.find('./board/column')
-                    if column:
+                    if column is not None:
                         new_action = ElementTree.Element('action', {
                                 'name' : str(action_id),
                                 'string' : name,
-- 
cgit v1.2.3


From bfb9896ddd49e29eb43a80ab0b668beef4536e32 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 7 Mar 2012 11:46:32 +0100
Subject: [FIX] database/create replaced by blocking database/create_database
 (so we can use a multi-workers OpenERP server; otherwise polling on the
 server would hit different workers resulting in errors).

bzr revid: vmt@openerp.com-20120307104632-w6cs6nxf04ltcpf1
---
 addons/web/controllers/main.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 71d01e2ef0a..a1d8f77ec70 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -358,11 +358,7 @@ class Database(openerpweb.Controller):
         return {"db_list": dbs}
 
     @openerpweb.jsonrequest
-    def progress(self, req, password, id):
-        return req.session.proxy('db').get_progress(password, id)
-
-    @openerpweb.jsonrequest
-    def create(self, req, fields):
+    def create_database(self, req, fields):
 
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         create_attrs = (
@@ -374,7 +370,7 @@ class Database(openerpweb.Controller):
         )
 
         try:
-            return req.session.proxy("db").create(*create_attrs)
+            return req.session.proxy("db").create_database(*create_attrs)
         except xmlrpclib.Fault, e:
             if e.faultCode and isinstance(e.faultCode, str)\
                 and e.faultCode.split(':')[0] == 'AccessDenied':
-- 
cgit v1.2.3


From 9a646fce10f3a918fce7766d672024019255c1ed Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Mar 2012 13:03:23 +0100
Subject: [ADD] permanent loading of saved filters

When selecting a saved filter, its data is now saved inside the
searchview's state, and re-used any time there's a search performed
(until the filter is replaced or the search view is cleared).

Some cleanup of the support code for loading filters
(SearchView.get_filters) also had to be performed in order not to fill
contexts with (potentially incorrect) crap in case the filter is
re-saved.

lp bug: https://launchpad.net/bugs/948219 fixed

bzr revid: xmo@openerp.com-20120307120323-pub0yuwjqk1r3y0p
---
 addons/web/controllers/main.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 165641d8049..5f22695405f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1308,10 +1308,15 @@ class SearchView(View):
         filters = Model.get_filters(model)
         for filter in filters:
             try:
-                filter["context"] = req.session.eval_context(
-                    parse_context(filter["context"], req.session))
-                filter["domain"] = req.session.eval_domain(
-                    parse_domain(filter["domain"], req.session))
+                parsed_context = parse_context(filter["context"], req.session)
+                filter["context"] = (parsed_context
+                        if not isinstance(parsed_context, common.nonliterals.BaseContext)
+                        else req.session.eval_context(parsed_context))
+
+                parsed_domain = parse_domain(filter["domain"], req.session)
+                filter["domain"] = (parsed_domain
+                        if not isinstance(parsed_domain, common.nonliterals.BaseDomain)
+                        else req.session.eval_domain(parsed_domain))
             except Exception:
                 logger.exception("Failed to parse custom filter %s in %s",
                                  filter['name'], model)
-- 
cgit v1.2.3


From c0439810efa83009741eb9307794e5cafb943df3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Mar 2012 17:05:03 +0100
Subject: [FIX] Add to dashboard domain & context merging problems

bzr revid: fme@openerp.com-20120307160503-w1mha79xiznl4x6h
---
 addons/web/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 71d01e2ef0a..fc1e1eb958e 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1344,6 +1344,7 @@ class SearchView(View):
         ctx = common.nonliterals.CompoundContext(context_to_save)
         ctx.session = req.session
         ctx = ctx.evaluate()
+        ctx['dashboard_merge_domains_contexts'] = False # TODO: replace this 6.1 workaround by attribute on <action/>
         domain = common.nonliterals.CompoundDomain(domain)
         domain.session = req.session
         domain = domain.evaluate()
-- 
cgit v1.2.3


From 601da46064c243049b7dcc6203d8d8069e927aea Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 Mar 2012 19:18:53 +0100
Subject: [FIX] manifest flag 'active' was renamed to 'auto_install' a while
 ago

The change occurred in server at revision 3989
and in addons at revision 6451, but had never
been done in openerp-web.
One indirect consequence was that the 'base'
modules was not considered auto-installable
anymore and its CSS files were not loaded on
web, causing layout issues, namely in the
modules kanban view.

Server rev 3989 = al@openerp.com-20120130211001-ytqx759fl920uegc
Addons rev 6451 = al@openerp.com-20120130211812-w0wu42hdu4l7koc4

lp bug: https://launchpad.net/bugs/948866 fixed

bzr revid: odo@openerp.com-20120314181853-kzr6lgqxxcz7rreu
---
 addons/web/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/controllers/main.py')

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index a41663ceec2..6f289612099 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -537,10 +537,10 @@ class Session(openerpweb.Controller):
         # already installed modules have no dependencies
         modules = dict.fromkeys(loaded, [])
 
-        # Compute active true modules that might be on the web side only
+        # Compute auto_install modules that might be on the web side only
         modules.update((name, openerpweb.addons_manifest[name].get('depends', []))
                       for name in candidates
-                      if openerpweb.addons_manifest[name].get('active'))
+                      if openerpweb.addons_manifest[name].get('auto_install'))
 
         # Retrieve database installed modules
         Modules = req.session.model('ir.module.module')
-- 
cgit v1.2.3