Commit 65a49076 authored by Yusei Tahara's avatar Yusei Tahara

Fixed previous changes. To use BaseData is correct for updating base metadata.

And, if BaseData is empty, don't connect oood.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18298 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2c05d5c2
...@@ -488,8 +488,10 @@ class OOoDocument(File, ConversionCacheMixin): ...@@ -488,8 +488,10 @@ class OOoDocument(File, ConversionCacheMixin):
based on the values provided by the user. This is implemented based on the values provided by the user. This is implemented
through the invocation of the conversion server. through the invocation of the conversion server.
""" """
# We must use original data which is uploaded by user from editform. data = self.getBaseData()
data = self.getData() if data in ('', None):
return
server_proxy = self._mkProxy() server_proxy = self._mkProxy()
response_code, response_dict, response_message = \ response_code, response_dict, response_message = \
server_proxy.run_setmetadata(self.getId(), server_proxy.run_setmetadata(self.getId(),
...@@ -502,4 +504,3 @@ class OOoDocument(File, ConversionCacheMixin): ...@@ -502,4 +504,3 @@ class OOoDocument(File, ConversionCacheMixin):
# Explicitly raise the exception! # Explicitly raise the exception!
raise ConversionError("OOoDocument: error getting document metadata %s:%s" raise ConversionError("OOoDocument: error getting document metadata %s:%s"
% (response_code, response_message)) % (response_code, response_message))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment