fixed editing of message contents

Author: Richard Jones

CHANGES.txt

@@ -4,6 +4,7 @@ are given with the most recent entry first.
 2004-10-?? 0.7.9
 Fixed:
 - popup listing uses filter args (thanks Marlon van den Berg)
+- fixed editing of message contents
 
 
 2004-10-15 0.7.8

roundup/backends/blobfiles.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: blobfiles.py,v 1.12.2.1 2004-06-24 07:14:48 richard Exp $
+#$Id: blobfiles.py,v 1.12.2.2 2004-10-15 01:10:22 richard Exp $
 '''This module exports file storage for roundup backends.
 Files are stored into a directory hierarchy.
 '''
@@ -79,11 +79,11 @@ def storefile(self, classname, nodeid, property, content):
 
         # save to a temp file
         name = name + '.tmp'
-        # make sure we don't register the rename action more than once
-        if not os.path.exists(name):
-            # save off the rename action
-            self.transactions.append((self.doStoreFile, (classname, nodeid,
-                property)))
+
+        # save off the rename action
+        self.transactions.append((self.doStoreFile, (classname, nodeid,
+            property)))
+
         open(name, 'wb').write(content)
 
     def getfile(self, classname, nodeid, property):
@@ -117,6 +117,9 @@ def doStoreFile(self, classname, nodeid, property, **databases):
         # determine the name of the file to write to
         name = self.filename(classname, nodeid, property)
 
+        if not os.path.exists(name+".tmp"):
+            return
+
         # content is being updated (and some platforms, eg. win32, won't
         # let us rename over the top of the old file)
         if os.path.exists(name):

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.24 2004-10-14 22:28:02 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.25 2004-10-15 01:10:22 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2655,19 +2655,23 @@ def set(self, itemid, **propvalues):
             content = propvalues['content']
             del propvalues['content']
 
-        # do the database create
+        # do the database set
         propvalues = self.set_inner(itemid, **propvalues)
 
         # do content?
         if content:
             # store and index
             self.db.storefile(self.classname, itemid, None, content)
-            mime_type = propvalues.get('type', self.get(itemid, 'type'))
-            if not mime_type:
+            if self.getprops().has_key('type'):
+                mime_type = propvalues.get('type', self.get(itemid, 'type',
+                    self.default_mime_type))
+            else:
                 mime_type = self.default_mime_type
             self.db.indexer.add_text((self.classname, itemid, 'content'),
                 content, mime_type)
 
+        propvalues['content'] = content
+
         # fire reactors
         self.fireReactors('set', itemid, oldvalues)
         return propvalues