summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorddm <ddm@openerp.com>2013-09-19 16:53:39 +0200
committerddm <ddm@openerp.com>2013-09-19 16:53:39 +0200
commit2ae6cacf45d2acf2c3ebf8af5d6fa933e0009fd8 (patch)
treed5ff81753d9d52ab6e08ebcd8f2636ba9e1144f9
parentbe89a0c8bdc348486d098d279be0c46818ebbe8a (diff)
[FIX] Ace could not edit inherited views
bzr revid: ddm@openerp.com-20130919145339-0vcs89mcnkgd2ham
-rw-r--r--addons/website/controllers/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index a263f6e8003..c5f069ce07a 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -156,7 +156,7 @@ class Website(openerp.addons.web.controllers.main.Home):
'name': v.name,
'id': v.id,
'header': False,
- 'active': v.inherit_id.id == v.inherit_option_id.id
+ 'active': (v.inherit_id.id == v.inherit_option_id.id) or (not optional and v.inherit_id.id)
})
return result