diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index cbbee7fcebd..17635688063 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -134,14 +134,15 @@ class Report(osv.Model):
         website = None
         if request and hasattr(request, 'website'):
             website = request.website
-        values.update({
-            'time': time,
-            'translate_doc': translate_doc,
-            'editable': True,  # Will active inherit_branding
-            'user': user,
-            'res_company': user.company_id,
-            'website': website,
-        })
+        values.update(
+            time=time,
+            translate_doc=translate_doc,
+            editable=True,  # Will active inherit_branding
+            user=user,
+            res_company=user.company_id,
+            website=website,
+            editable_no_editor=True,
+        )
         return view_obj.render(cr, uid, template, values, context=context)
 
     #--------------------------------------------------------------------------
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index fcb957cafda..601d3016068 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -3,6 +3,7 @@
 
     var website = openerp.website;
     var _t = openerp._t;
+    website.no_editor = !!$(document.documentElement).data('editable-no-editor');
 
     website.add_template_file('/website/static/src/xml/website.editor.xml');
     website.dom_ready.done(function () {
@@ -496,6 +497,17 @@
             this.$('#website-top-edit').hide();
             this.$('#website-top-view').show();
 
+            var $edit_button = this.$('button[data-action=edit]')
+                    .prop('disabled', website.no_editor);
+            if (website.no_editor) {
+                var help_text = $(document.documentElement).data('editable-no-editor');
+                $edit_button.parent()
+                    // help must be set on form above button because it does
+                    // not appear on disabled button
+                    .attr('title', help_text);
+            }
+
+
             $('.dropdown-toggle').dropdown();
             this.customize_setup();
 
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 4d9c9fcd73d..684a46a9f43 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -14,7 +14,8 @@
                         <span class="icon-bar"></span>
                     </button>
                     <form class="navbar-form navbar-left">
-                        <button type="button" data-action="edit" class="btn btn-primary hidden">Edit</button>
+                        <button type="button" data-action="edit"
+                                class="btn btn-primary hidden">Edit</button>
                     </form>
                 </div>
                 <div class="collapse navbar-collapse navbar-edit-collapse">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 7e641d1bd75..92483061e10 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -59,6 +59,7 @@
     <html t-att-lang="lang and lang.replace('_', '-')"
           t-att-data-website-id="website.id if editable else None"
           t-att-data-editable="'1' if editable else None"
+          t-att-data-editable-no-editor="editable_no_editor or None"
           t-att-data-translatable="'1' if translatable else None"
           t-att-data-view-xmlid="xmlid if editable else None"
           t-att-data-main-object="repr(main_object) if editable else None"
@@ -179,8 +180,10 @@
     <xpath expr="//body" position="inside">
         <div id="website-top-navbar-placeholder" class="navbar navbar-inverse navbar-fixed-top hidden-xs">
             <div class="navbar-header">
-                <form class="navbar-form navbar-left">
-                    <button type="button" class="btn btn-primary">Edit</button>
+                <form class="navbar-form navbar-left" title="editable_no_editor or None">
+                    <button type="button" class="btn btn-primary"
+                            disabled="'disabled' if editable_no_editor else None"
+                        >Edit</button>
                 </form>
             </div>
             <div class="collapse navbar-collapse navbar-edit-collapse">
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index bb6c8cb2847..f0d15fad609 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -257,8 +257,13 @@ class QWeb(orm.AbstractModel):
                     uid = qwebcontext.get('request') and qwebcontext['request'].uid or None
                     can_see = self.user_has_groups(cr, uid, groups=attribute_value) if cr and uid else False
                     if not can_see:
+                        if qwebcontext.get('editable') and not qwebcontext.get('editable_no_editor'):
+                            errmsg = _("Editor disabled because some content can not be seen by a user who does not belong to the groups %s")
+                            raise openerp.http.Retry(
+                                _("User does not belong to groups %s") % attribute_value, {
+                                    'editable_no_editor': errmsg % attribute_value
+                                })
                         return ''
-                    continue
 
                 if isinstance(attribute_value, unicode):
                     attribute_value = attribute_value.encode("utf8")
@@ -302,7 +307,7 @@ class QWeb(orm.AbstractModel):
             for current_node in element.childNodes:
                 try:
                     g_inner.append(self.render_node(current_node, qwebcontext))
-                except QWebException:
+                except (QWebException, openerp.http.Retry):
                     raise
                 except Exception:
                     template = qwebcontext.get('__template__')
diff --git a/openerp/http.py b/openerp/http.py
index 98a6556570a..44df279bdb9 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -1037,6 +1037,15 @@ mimetypes.add_type('application/font-woff', '.woff')
 mimetypes.add_type('application/vnd.ms-fontobject', '.eot')
 mimetypes.add_type('application/x-font-ttf', '.ttf')
 
+class Retry(RuntimeError):
+    """ Exception raised during QWeb rendering to signal that the rendering
+    should be retried with the provided ``render_updates`` dict merged into
+    the previous rendering context
+    """
+    def __init__(self, name, render_updates=None):
+        super(Retry, self).__init__(name)
+        self.updates = render_updates or {}
+
 class Response(werkzeug.wrappers.Response):
     """ Response object passed through controller route chain.
 
@@ -1077,7 +1086,13 @@ class Response(werkzeug.wrappers.Response):
     def render(self):
         view_obj = request.registry["ir.ui.view"]
         uid = self.uid or request.uid or openerp.SUPERUSER_ID
-        return view_obj.render(request.cr, uid, self.template, self.qcontext, context=request.context)
+        while True:
+            try:
+                return view_obj.render(
+                    request.cr, uid, self.template, self.qcontext,
+                    context=request.context)
+            except Retry, e:
+                self.qcontext.update(e.updates)
 
     def flatten(self):
         self.response.append(self.render())
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1ada929482d..0a23dda61e3 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1704,8 +1704,8 @@ class BaseModel(object):
            :return: True if the current user is a member of one of the
                     given groups
         """
-        return any([self.pool.get('res.users').has_group(cr, uid, group_ext_id)
-                        for group_ext_id in groups.split(',')])
+        return any(self.pool['res.users'].has_group(cr, uid, group_ext_id)
+                   for group_ext_id in groups.split(','))
 
     def _get_default_form_view(self, cr, user, context=None):
         """ Generates a default single-line form view using all fields