merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -17,6 +17,7 @@ Fixed:
 - fixed templating menu() sort_on handling (sf bug 1221936)
 - allow specification of pagesize, sorting and filtering in "classhelp"
   popups (sf bug 1211800)
+- handle dropped properies in rdbms/metakit journal export (sf bug 1203569)
 
 
 2005-05-02 0.8.3

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.88.2.4 2005-03-03 22:12:35 richard Exp $
+# $Id: back_metakit.py,v 1.88.2.5 2005-06-24 06:40:18 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1704,7 +1704,12 @@ def export_journals(self):
             for nodeid, date, user, action, params in self.history(nodeid):
                 date = date.get_tuple()
                 if action == 'set':
+                    export_data = {}
                     for propname, value in params.items():
+                        if not properties.has_key(propname):
+                            # property no longer in the schema
+                            continue
+
                         prop = properties[propname]
                         # make sure the params are eval()'able
                         if value is None:
@@ -1715,7 +1720,8 @@ def export_journals(self):
                             value = value.get_tuple()
                         elif isinstance(prop, Password):
                             value = str(value)
-                        params[propname] = value
+                        export_data[propname] = value
+                    params = export_data
                 l = [nodeid, date, user, action, params]
                 r.append(map(repr, l))
         return r