summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/website.editor.js
diff options
context:
space:
mode:
authorchm@openerp.com <>2014-04-08 10:07:36 +0200
committerchm@openerp.com <>2014-04-08 10:07:36 +0200
commitbe5fe933ec35fa1b1960d5326c59a9026a8b8545 (patch)
tree7e1b18ec1df60bc9ae97d212aa12bb716c57135a /addons/website/static/src/js/website.editor.js
parentfd593a3049407103165e4a872e92b9d39f641578 (diff)
parentdcdf729b9fb2404ac076aa0cd178df2c27dae0fb (diff)
[MERGE] from trunk
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
-rw-r--r--addons/website/static/src/js/website.editor.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index ae126ad16ab..c965c5ef834 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1500,7 +1500,8 @@
args: [],
kwargs: {
fields: ['name', 'website_url'],
- domain: [['res_model', '=', 'ir.ui.view']],
+ domain: [['res_model', '=', 'ir.ui.view'], '|',
+ ['mimetype', '=', false], ['mimetype', '=like', 'image/%']],
order: 'id desc',
context: website.get_context(),
}