# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1249405134 -7200
# Node ID 38a4e83c8160632d58b83f9354b3706fb318220c
# Parent  44f041222d0fa99f9f676ba3f7b2b1181c4d035f# Parent  6220500bada7387535a0c9970633fb9bfbb5af3d
merge

diff -r 44f041222d0f -r 38a4e83c8160 web/views/editforms.py
--- a/web/views/editforms.py	Tue Aug 04 18:58:38 2009 +0200
+++ b/web/views/editforms.py	Tue Aug 04 18:58:54 2009 +0200
@@ -95,9 +95,10 @@
 
 
 class ClickAndEditFormView(FormViewMixIn, EntityView):
-    """form used to permit ajax edition of an attribute of an entity in a view
+    """form used to permit ajax edition of a relation or attribute of an entity
+    in a view, if logged user have the permission to edit it.
 
-    (double-click on the field to see an appropriate edition widget)
+    (double-click on the field to see an appropriate edition widget).
     """
     id = 'doreledit'
     __select__ = non_final_entity() & match_kwargs('rtype')
@@ -272,8 +273,6 @@
             self.wview(vid, entity.related(rtype, role), 'null')
             return False
         if eschema.role_rproperty(role, rschema, 'composite') == role:
-            self.warning('reledit cannot be applied : (... %s %s [composite])'
-                         % (rschema, eschema))
             self.wview(rvid, entity.related(rtype, role), 'null')
             return False
         return super(AutoClickAndEditFormView, self).should_edit_relation(
diff -r 44f041222d0f -r 38a4e83c8160 web/views/startup.py
--- a/web/views/startup.py	Tue Aug 04 18:58:38 2009 +0200
+++ b/web/views/startup.py	Tue Aug 04 18:58:54 2009 +0200
@@ -76,7 +76,7 @@
 
     def folders(self):
         self.w(u'<h4>%s</h4>\n' % self.req._('Browse by category'))
-        self.vreg.select('views', 'tree', self.req).render(w=self.w)
+        self.vreg['views'].select('tree', self.req).render(w=self.w)
 
     def startup_views(self):
         self.w(u'<h4>%s</h4>\n' % self.req._('Startup views'))