changeset 4495:fecec62aa2a7

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 18 Jan 2009 12:54:54 +0100
parents af211e2f132c (current diff) 8f8ba97409da (diff)
children c76d50dac855
files
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/widget/browser.py	Sun Jan 18 12:54:18 2009 +0100
+++ b/MoinMoin/widget/browser.py	Sun Jan 18 12:54:54 2009 +0100
@@ -15,7 +15,8 @@
         _ = request.getText
         base.Widget.__init__(self, request, **kw)
         self.data = None
-        self.data_id = 'dbw.'
+        self.unqual_data_id = 'dbw.'
+        self.data_id = request.formatter.qualify_id(self.unqual_data_id)
         # prefixed with __ are untranslated and to be used in the JS
         self._all = _('[all]')
         self.__all = '[all]'
@@ -37,7 +38,8 @@
         """
         self.data = dataset
         if dataset.data_id:
-            self.data_id = 'dbw.%s.' % dataset.data_id
+            self.unqual_data_id = 'dbw.%s.' % dataset.data_id
+            self.data_id = self.request.formatter.qualify_id(self.unqual_data_id)
 
     def _name(self, elem):
         """ return name tag for a HTML element
@@ -115,7 +117,7 @@
         if havefilters:
             result.append(fmt.rawHTML('<input type="submit" value="%s" %s>' % (self._filter, self._name('submit'))))
 
-        result.append(fmt.table(1, id='%stable' % self.data_id))
+        result.append(fmt.table(1, id='%stable' % self.unqual_data_id))
 
         # add header line
         if self._show_header:
--- a/wiki/htdocs/common/js/common.js	Sun Jan 18 12:54:18 2009 +0100
+++ b/wiki/htdocs/common/js/common.js	Sun Jan 18 12:54:54 2009 +0100
@@ -302,7 +302,7 @@
             elem = form.elements[eidx];
             name = elem.name;
             if (name) {
-                if (name.substr(0,4) == 'dbw.' && name.substr(-7) == '.submit')
+                if (name.indexOf('dbw.') >= 0 && name.substr(-7) == '.submit')
                     elem.style.display = 'none';
             }
         }