[forms] consider inline creation form information as linkto info. Closes #3161121
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/test/unittest_views_forms.py Mon Sep 23 14:55:56 2013 +0200
@@ -0,0 +1,36 @@
+# copyright 2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of CubicWeb.
+#
+# CubicWeb is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option)
+# any later version.
+#
+# CubicWeb is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
+
+from cubicweb.devtools.testlib import CubicWebTC
+
+class InlinedFormTC(CubicWebTC):
+
+ def test_linked_to(self):
+ req = self.request()
+ formview = req.vreg['views'].select(
+ 'inline-creation', req,
+ etype='File', rtype='described_by_test', role='subject',
+ peid=123,
+ petype='Salesterm')
+ self.assertEqual({('described_by_test', 'object'): [123]},
+ formview.form.linked_to)
+
+if __name__ == '__main__':
+ from logilab.common.testlib import unittest_main
+ unittest_main()
+
--- a/web/views/forms.py Wed May 21 22:54:46 2014 +0200
+++ b/web/views/forms.py Mon Sep 23 14:55:56 2013 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of CubicWeb.
@@ -41,6 +41,7 @@
but you'll use this one rarely.
"""
+
__docformat__ = "restructuredtext en"
from warnings import warn
@@ -51,7 +52,7 @@
from logilab.common.textutils import splitstrip
from logilab.common.deprecation import deprecated
-from cubicweb import ValidationError
+from cubicweb import ValidationError, neg_role
from cubicweb.utils import support_args
from cubicweb.predicates import non_final_entity, match_kwargs, one_line_rset
from cubicweb.web import RequestError, ProcessFormError
@@ -400,12 +401,21 @@
@property
@cached
def linked_to(self):
- # if current form is not the main form, exit immediately
+ linked_to = {}
+ # case where this is an embeded creation form
+ try:
+ eid = int(self.cw_extra_kwargs['peid'])
+ except KeyError:
+ pass
+ else:
+ ltrtype = self.cw_extra_kwargs['rtype']
+ ltrole = neg_role(self.cw_extra_kwargs['role'])
+ linked_to[(ltrtype, ltrole)] = [eid]
+ # now consider __linkto if the current form is the main form
try:
self.field_by_name('__maineid')
except form.FieldNotFound:
- return {}
- linked_to = {}
+ return linked_to
for linkto in self._cw.list_form_param('__linkto'):
ltrtype, eid, ltrole = linkto.split(':')
linked_to.setdefault((ltrtype, ltrole), []).append(int(eid))