Mercurial > p > roundup > code
comparison roundup/cgi/templating.py @ 3400:7a3e791b2b2b maint-0.8
fix Mutlilink display
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Wed, 27 Jul 2005 22:54:12 +0000 |
| parents | a955987327c2 |
| children | 639a3d1014e9 |
comparison
equal
deleted
inserted
replaced
| 3398:54f98b078e44 | 3400:7a3e791b2b2b |
|---|---|
| 380 be key values, not ids. | 380 be key values, not ids. |
| 381 ''' | 381 ''' |
| 382 l = [] | 382 l = [] |
| 383 for entry in ids: | 383 for entry in ids: |
| 384 if num_re.match(entry): | 384 if num_re.match(entry): |
| 385 l.append(linkcl.get(entry, key)) | 385 label = linkcl.get(entry, key) |
| 386 # fall back to designator if label is None | |
| 387 if label is None: label = '%s%s'%(linkcl.classname, entry) | |
| 388 l.append(label) | |
| 386 else: | 389 else: |
| 387 l.append(entry) | 390 l.append(entry) |
| 388 return l | 391 return l |
| 389 | 392 |
| 390 def input_html4(**attrs): | 393 def input_html4(**attrs): |
| 932 subml.append('<strike>%s</strike>'%label) | 935 subml.append('<strike>%s</strike>'%label) |
| 933 else: | 936 else: |
| 934 if hrefable: | 937 if hrefable: |
| 935 subml.append('<a href="%s%s">%s</a>'%( | 938 subml.append('<a href="%s%s">%s</a>'%( |
| 936 classname, linkid, label)) | 939 classname, linkid, label)) |
| 940 elif label is None: | |
| 941 subml.append('%s%s'%(classname, | |
| 942 linkid)) | |
| 937 else: | 943 else: |
| 938 subml.append(label) | 944 subml.append(label) |
| 939 ml.append(sublabel + ', '.join(subml)) | 945 ml.append(sublabel + ', '.join(subml)) |
| 940 cell.append('%s:\n %s'%(self._(k), ', '.join(ml))) | 946 cell.append('%s:\n %s'%(self._(k), ', '.join(ml))) |
| 941 elif isinstance(prop, hyperdb.Link) and args[k]: | 947 elif isinstance(prop, hyperdb.Link) and args[k]: |
| 1804 | 1810 |
| 1805 linkcl = self._db.classes[self._prop.classname] | 1811 linkcl = self._db.classes[self._prop.classname] |
| 1806 k = linkcl.labelprop(1) | 1812 k = linkcl.labelprop(1) |
| 1807 labels = [] | 1813 labels = [] |
| 1808 for v in self._value: | 1814 for v in self._value: |
| 1809 labels.append(linkcl.get(v, k)) | 1815 label = linkcl.get(v, k) |
| 1816 # fall back to designator if label is None | |
| 1817 if label is None: label = '%s%s'%(self._prop.classname, k) | |
| 1818 labels.append(label) | |
| 1810 value = ', '.join(labels) | 1819 value = ', '.join(labels) |
| 1811 if escape: | 1820 if escape: |
| 1812 value = cgi.escape(value) | 1821 value = cgi.escape(value) |
| 1813 return value | 1822 return value |
| 1814 | 1823 |