[Erp5-report] r18298 - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Dec 13 12:05:29 2007
New Revision: 18298

URL: http://svn.erp5.org?rev=18298&view=rev
Log:
Fixed previous changes. To use BaseData is correct for updating base metadata.
And, if BaseData is empty, don't connect oood.

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=18298&r1=18297&r2=18298&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py Thu Dec 13 12:05:29 2007
@@ -488,8 +488,10 @@
       based on the values provided by the user. This is implemented
       through the invocation of the conversion server.
     """
-    # We must use original data which is uploaded by user from editform.
-    data = self.getData()
+    data = self.getBaseData()
+    if data in ('', None):
+      return
+
     server_proxy = self._mkProxy()
     response_code, response_dict, response_message = \
           server_proxy.run_setmetadata(self.getId(),
@@ -502,4 +504,3 @@
       # Explicitly raise the exception!
       raise ConversionError("OOoDocument: error getting document metadata %s:%s"
                         % (response_code, response_message))
-