summaryrefslogtreecommitdiff
path: root/odoo/addons/base/models/assetsbundle.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-08-09 19:33:32 +0200
committerChristophe Simonis <chs@odoo.com>2018-08-09 19:33:32 +0200
commit7717f082c08d6121cd7d2478e14ff855afd6d384 (patch)
tree5b26650048ba249f021792c1d4cb5900e7f0f7a4 /odoo/addons/base/models/assetsbundle.py
parentd3df57bf906b3ff1964d3c96ea6b45950858099c (diff)
parentaf35aea6b0d6ff52126141ab0e3754a0427553fc (diff)
[MERGE] forward port branch saas-11.3 up to af35aea6b0d
Diffstat (limited to 'odoo/addons/base/models/assetsbundle.py')
-rw-r--r--odoo/addons/base/models/assetsbundle.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/odoo/addons/base/models/assetsbundle.py b/odoo/addons/base/models/assetsbundle.py
index 4cd424c994a..2970cb8d636 100644
--- a/odoo/addons/base/models/assetsbundle.py
+++ b/odoo/addons/base/models/assetsbundle.py
@@ -16,7 +16,7 @@ except ImportError:
from datetime import datetime
from subprocess import Popen, PIPE
from collections import OrderedDict
-from odoo import fields, tools
+from odoo import fields, tools, SUPERUSER_ID
from odoo.tools.pycompat import string_types, to_text
from odoo.http import request
from odoo.modules.module import get_resource_path
@@ -239,10 +239,11 @@ class AssetsBundle(object):
self.env.cr.execute("""
SELECT max(id)
FROM ir_attachment
- WHERE url like %s
+ WHERE create_uid = %s
+ AND url like %s
GROUP BY datas_fname
ORDER BY datas_fname
- """, [url_pattern])
+ """, [SUPERUSER_ID, url_pattern])
attachment_ids = [r[0] for r in self.env.cr.fetchall()]
return self.env['ir.attachment'].sudo().browse(attachment_ids)