# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1247248302 -7200
# Node ID 50e01ff07f06e5ff68711ff67a9f0be0e4edf676
# Parent  1e8ce077b62a405ca4753eec02d8df8c146db31c# Parent  cca71dcbeb706837f3c17dfd96bc8de06712e1d1
merge

diff -r cca71dcbeb70 -r 50e01ff07f06 web/views/editforms.py
--- a/web/views/editforms.py	Fri Jul 10 16:03:54 2009 +0200
+++ b/web/views/editforms.py	Fri Jul 10 19:51:42 2009 +0200
@@ -20,7 +20,7 @@
 from cubicweb.utils import make_uid, compute_cardinality, get_schema_property
 from cubicweb.view import EntityView
 from cubicweb.common import tags
-from cubicweb.web import INTERNAL_FIELD_VALUE, stdmsgs, eid_param
+from cubicweb.web import INTERNAL_FIELD_VALUE, stdmsgs, eid_param, uicfg
 from cubicweb.web.form import FormViewMixIn
 from cubicweb.web.formfields import guess_field
 from cubicweb.web.formwidgets import Button, SubmitButton, ResetButton
@@ -87,7 +87,6 @@
     """
     id = 'reledit'
     __select__ = non_final_entity() & match_kwargs('rtype')
-
     # FIXME editableField class could be toggleable from userprefs
 
     _onclick = u"showInlineEditionForm(%(eid)s, '%(rtype)s', '%(divid)s')"
@@ -138,6 +137,11 @@
             self._attribute_form(entity, value, rtype, role, reload,
                                  row, col, default, landing_zone)
         else:
+            vid = uicfg.primaryview_display_ctrl.etype_get(entity.e_schema,
+                                                           rtype, role)
+            if vid != 'reledit': # reledit explicitly disabled
+                self.wview(vid, entity.related(rtype, role))
+                return
             if rvid is None:
                 rvid = self._compute_best_vid(entity, rtype, role)
             rset = entity.related(rtype, role)