@required in forms may now specify properties of linked items

(patch [SF#1507093])

Author: Richard Jones

CHANGES.txt

@@ -10,6 +10,8 @@ Feature:
 - added StringHTMLProperty wrapped() method to wrap long lines in issue
   display
 - include the popcal in Date field editing and search fields by default
+- @required in forms may now specify properties of linked items (sf patch
+  1507093)
 
 
 Fixed:

doc/index.txt

@@ -150,6 +150,7 @@ Alexander Smishlajev,
 Nathaniel Smith,
 Maciej Starzyk,
 Mitchell Surface,
+Jon C. Thomason
 Mike Thompson,
 Michael Twomey,
 Karl Ulbrich,

roundup/cgi/form_parser.py

@@ -284,6 +284,17 @@ def parse(self, create=0, num_re=re.compile('^\d+$')):
                             'value "%(entry)s" not a designator') % locals()
                     value.append((m.group(1), m.group(2)))
 
+                    # get details of linked class
+                    lcn = m.group(1)
+                    lcl = self.db.classes[lcn]
+                    lnodeid = m.group(2)
+                    if not all_propdef.has_key(lcn):
+                        all_propdef[lcn] = lcl.getprops()
+                    if not all_props.has_key((lcn, lnodeid)):
+                        all_props[(lcn, lnodeid)] = {}
+                    if not got_props.has_key((lcn, lnodeid)):
+                        got_props[(lcn, lnodeid)] = {}
+
                 # make sure the link property is valid
                 if (not isinstance(propdef[propname], hyperdb.Multilink) and
                         not isinstance(propdef[propname], hyperdb.Link)):
@@ -296,7 +307,19 @@ def parse(self, create=0, num_re=re.compile('^\d+$')):
 
             # detect the special ":required" variable
             if d['required']:
-                all_required[this] = self.extractFormList(form[key])
+                for entry in self.extractFormList(form[key]):
+                    m = self.FV_SPECIAL.match(entry)
+                    if not m:
+                        raise FormError, self._('The form action claims to '
+                            'require property "%(property)s" '
+                            'which doesn\'t exist') % {
+                            'property':propname}
+                    if m.group('classname'):
+                        this = (m.group('classname'), m.group('id'))
+                        entry = m.group('propname')
+                    if not all_required.has_key(this):
+                        all_required[this] = []
+                    all_required[this].append(entry)
                 continue
 
             # see if we're performing a special multilink action

test/test_cgi.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_cgi.py,v 1.27 2006-01-25 02:24:28 richard Exp $
+# $Id: test_cgi.py,v 1.28 2006-08-11 00:18:59 richard Exp $
 
 import unittest, os, shutil, errno, sys, difflib, cgi, re
 
@@ -152,6 +152,10 @@ def testNothingWithRequired(self):
             {':required': 'status', 'status':''}, 'issue')
         self.assertRaises(FormError, self.parseForm,
             {':required': 'nosy', 'nosy':''}, 'issue')
+        self.assertRaises(FormError, self.parseForm,
+            {':required': 'msg-1@content', 'msg-1@content':''}, 'issue')
+        self.assertRaises(FormError, self.parseForm,
+            {':required': 'msg-1@content'}, 'issue')
 
     #
     # Nonexistant edit