[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py - tweaking

[Yvo Schubbe]

Log message for revision 130228:
  - tweaking

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py	2013-05-02 10:48:48 UTC (rev 130227)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/batch.py	2013-05-02 11:13:16 UTC (rev 130228)
@@ -89,9 +89,11 @@
         for k, v in kw.items():
             if not v or k == 'portal_status_message':
                 del kw[k]
+            elif isinstance(v, unicode):
+                kw[k] = v.encode(self._getBrowserCharset())
 
-        query = kw and ('?%s' % make_query(kw)) or ''
-        return u'%s%s' % (target, query)
+        query = kw and u'?{0}'.format(make_query(kw)) or u''
+        return u'{0}{1}'.format(target, query)
 
     # interface
 
@@ -195,7 +197,7 @@
     @memoize
     @decode
     def summary_match(self):
-        return self._getNavigationVars().get('SearchableText')
+        return self._getNavigationVars().get('SearchableText', None)
 
 
 class BatchFormMixin(BatchViewBase):