merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -6,6 +6,8 @@ Fixed:
 - handle capitalisation of class names in text hyperlinking (sf bug
   1101043)
 - quote full-text search text in URL generation
+- fixed problem migrating mysql databases
+- fix search_checkboxes macro (sf patch 1113828)
 
 
 2005-01-06 0.7.11

roundup/backends/back_mysql.py

@@ -329,7 +329,6 @@ def add_new_columns_v2(self):
                     self.cursor.fetchall():
                 nodeid = int(nodeid)
                 journaldate = date.Date(journaldate)
-                params = eval(params)
                 olddata.append((nodeid, journaldate, journaltag, action,
                     params))
 
@@ -342,8 +341,9 @@ def add_new_columns_v2(self):
 
             # re-create journal table
             self.create_journal_table(klass)
+            dc = self.hyperdb_to_sql_value[hyperdb.Date]
             for nodeid, journaldate, journaltag, action, params in olddata:
-                self.save_journal(cn, cols, nodeid, journaldate,
+                self.save_journal(cn, cols, nodeid, dc(journaldate),
                     journaltag, action, params)
 
             # make sure the normal schema update code doesn't try to

templates/classic/html/page.html

@@ -154,10 +154,11 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
 
 <td metal:define-macro="search_checkboxes">
  <ul class="search-checkboxes"
-     tal:define="value python:request.form.getvalue(name)">
+     tal:define="value python:request.form.getvalue(name);
+                 values python:value and value.split(',') or []">
  <li tal:repeat="s python:db[db_klass].list()">
   <input type="checkbox" tal:attributes="name name; id string:$name-${s/id};
-    value s/id; checked python:value == s.id" />
+    value s/id; checked python:s.id in values" />
   <label tal:attributes="for string:$name-${s/id}"
          tal:content="python:s[db_content]" />
  </li>