Skip to content

Commit 74f909c

Browse files
author
Richard Jones
committed
make LinkHTMLProperty handle non-existing keys (patch [SF#1815895])
1 parent 4480f1b commit 74f909c

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Fixed:
6262
journal "create" events
6363
- fix a couple more old instances of "type" instead of "ENGINE" for mysql
6464
backend
65+
- make LinkHTMLProperty handle non-existing keys (sf patch 1815895)
6566

6667

6768
2007-02-15 1.3.3

doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Ajit George,
9696
Frank Gibbons,
9797
Johannes Gijsbers,
9898
Gus Gollings,
99+
Philipp Gortan,
99100
Dan Grassi,
100101
Robin Green,
101102
Jason Grout,

roundup/cgi/form_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ def parse(self, create=0, num_re=re.compile('^\d+$')):
541541
cl = self.db.classes[self.classname]
542542
if cl.get(nodeid, entry) is not None:
543543
required.remove(entry)
544-
544+
545545
# any required values not present?
546546
if not required:
547547
continue

roundup/cgi/templating.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,10 @@ def plain(self, escape=0):
17921792
return ''
17931793
linkcl = self._db.classes[self._prop.classname]
17941794
k = linkcl.labelprop(1)
1795-
value = str(linkcl.get(self._value, k))
1795+
if num_re.match(self._value):
1796+
value = str(linkcl.get(self._value, k))
1797+
else :
1798+
value = self._value
17961799
if escape:
17971800
value = cgi.escape(value)
17981801
return value
@@ -1811,7 +1814,7 @@ def field(self, showid=0, size=None):
18111814
value = ''
18121815
else:
18131816
k = linkcl.getkey()
1814-
if k:
1817+
if k and num_re.match(self._value):
18151818
value = linkcl.get(self._value, k)
18161819
else:
18171820
value = self._value

0 commit comments

Comments
 (0)