summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/website.editor.js
diff options
context:
space:
mode:
authorajay javiya (OpenERP) <aja@tinyerp.com>2014-03-28 09:58:15 +0530
committerajay javiya (OpenERP) <aja@tinyerp.com>2014-03-28 09:58:15 +0530
commite63646130e8f01ff0c8378c2316e8eaf8a47e44d (patch)
tree93e58717e8ba23e3eb5cfac56288afda681cc8f0 /addons/website/static/src/js/website.editor.js
parentb8b562ce0a04e09b805f2f64b5631ae506801be3 (diff)
parentcf311bda60da7c6b166bdee28937fff097009508 (diff)
[MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
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(),
}