Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-24 02:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

add conditionnal mimetype upload file s3

Browse Source
This commit is contained in:
cyrilmanuel
2023-01-26 11:59:45 +01:00
parent 6dd6d71807
commit 7e785507f7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_s3/models/ir_attachment.py
+5 -1
View File
@@ -181,6 +181,7 @@ class IrAttachment(models.Model):
@api.model @api.model
def _store_file_write(self, key, bin_data): def _store_file_write(self, key, bin_data):
location = self.env.context.get('storage_location') or self._storage() location = self.env.context.get('storage_location') or self._storage()
mimetype = self.env.context.get('mimetype') or self.mimetype
if location == 's3': if location == 's3':
bucket = self._get_s3_bucket() bucket = self._get_s3_bucket()
obj = bucket.Object(key=key) obj = bucket.Object(key=key)
@@ -189,7 +190,10 @@ class IrAttachment(models.Model):
file.seek(0) file.seek(0)
filename = 's3://%s/%s' % (bucket.name, key) filename = 's3://%s/%s' % (bucket.name, key)
try: try:
obj.upload_fileobj(file) if mimetype:
obj.upload_fileobj(file, ExtraArgs={'ContentType': mimetype})
else:
obj.upload_fileobj(file)
except ClientError as error: except ClientError as error:
# log verbose error from s3, return short message for user # log verbose error from s3, return short message for user
_logger.exception( _logger.exception(
base_attachment_object_storage/models/ir_attachment.py
+4
View File
@@ -164,6 +164,10 @@ class IrAttachment(models.Model):
return len(bin_data) <= limit return len(bin_data) <= limit
return False return False
def _get_datas_related_values(self, data, mimetype):
self=self.with_context(mimetype=mimetype)
return super(IrAttachment, self)._get_datas_related_values(data, mimetype)
def _inverse_datas(self): def _inverse_datas(self):
# override in order to store files that need fast access, # override in order to store files that need fast access,
# we keep them in the database instead of the object storage # we keep them in the database instead of the object storage