changeset 523:fe7e720bd778

merged main
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Fri, 23 Apr 2010 22:38:00 +0200
parents 0d5369896835 (diff) 64d08878782b (current diff)
children 1414a0d200ec
files data/plugin/macro/DictColumns.py htdocs/svg-edit/build/yuicompressor.jar htdocs/svg-edit/editor/ext-connector.js htdocs/svg-edit/editor/jgraduate/css/jGraduate-0.2.0.css htdocs/svg-edit/editor/jquery-ui/jquery-ui-1.7.2.custom.min.js htdocs/svg-edit/editor/locale/lang.zh.js
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/macro/DictColumns.py	Mon Apr 12 13:00:10 2010 +0200
+++ b/data/plugin/macro/DictColumns.py	Fri Apr 23 22:38:00 2010 +0200
@@ -189,7 +189,9 @@
             for name in names:
                 if name in page_dict.keys():
                     value = page_dict.get(name, '')
-                    value = value.replace('attachment:', 'attachment:%s/' % name)
+                    value = value.replace('attachment:', 'attachment:%s/' % page_name)
+                    value = value.replace('<<Image(', '<<Image(%s/' % page_name)
+
                     if self.wiki_parser:
                         row.append((wikiutil.renderText(request, self.wiki_parser, value),
                                     wikiutil.escape(value, 1)))