Mercurial > p > roundup > code
comparison roundup/cgi/templating.py @ 3936:63d58cc1394a
make LinkHTMLProperty handle non-existing keys (patch [SF#1815895])
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Fri, 02 Nov 2007 23:17:59 +0000 |
| parents | e89bcb28f683 |
| children | 5857cd1a0db9 |
comparison
equal
deleted
inserted
replaced
| 3935:1dab48842cbd | 3936:63d58cc1394a |
|---|---|
| 1790 | 1790 |
| 1791 if self._value is None: | 1791 if self._value is None: |
| 1792 return '' | 1792 return '' |
| 1793 linkcl = self._db.classes[self._prop.classname] | 1793 linkcl = self._db.classes[self._prop.classname] |
| 1794 k = linkcl.labelprop(1) | 1794 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 | |
| 1796 if escape: | 1799 if escape: |
| 1797 value = cgi.escape(value) | 1800 value = cgi.escape(value) |
| 1798 return value | 1801 return value |
| 1799 | 1802 |
| 1800 def field(self, showid=0, size=None): | 1803 def field(self, showid=0, size=None): |
| 1809 linkcl = self._db.getclass(self._prop.classname) | 1812 linkcl = self._db.getclass(self._prop.classname) |
| 1810 if self._value is None: | 1813 if self._value is None: |
| 1811 value = '' | 1814 value = '' |
| 1812 else: | 1815 else: |
| 1813 k = linkcl.getkey() | 1816 k = linkcl.getkey() |
| 1814 if k: | 1817 if k and num_re.match(self._value): |
| 1815 value = linkcl.get(self._value, k) | 1818 value = linkcl.get(self._value, k) |
| 1816 else: | 1819 else: |
| 1817 value = self._value | 1820 value = self._value |
| 1818 return self.input(name=self._formname, value=value, size=size) | 1821 return self.input(name=self._formname, value=value, size=size) |
| 1819 | 1822 |