summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorSimon Lejeune <sle@openerp.com>2015-09-03 17:53:41 +0200
committerSimon Lejeune <sle@openerp.com>2015-09-03 18:05:19 +0200
commit30e07438b509fbb2badce0688ece9243f97afabe (patch)
treebb0ee02590f5aad420968f447f145079f748b7d0 /addons/web/static/src
parent1962fe73edf157dd56b72ce656567e9eb1f471c3 (diff)
[FIX] web: view manager: sanitize type
by ignoring the views which types aren't in the view registry
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_manager.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js
index cd773dc0c76..4f0f34bbc9d 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/addons/web/static/src/js/view_manager.js
@@ -50,7 +50,11 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
_.each(views, function (view) {
var view_type = view[1] || view.view_type;
var View = core.view_registry.get(view_type, true);
- var view_label = View ? View.prototype.display_name: (void 'nope');
+ if (!View) {
+ console.error("View type", "'"+view[1]+"'", "is not present in the view registry.");
+ return;
+ }
+ var view_label = View.prototype.display_name;
var view_descr = {
controller: null,
options: view.options || {},
@@ -59,10 +63,10 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
label: view_label,
embedded_view: view.embedded_view,
title: self.title,
- button_label: View ? _.str.sprintf(_t('%(view_type)s view'), {'view_type': (view_label || view_type)}) : (void 'nope'),
- multi_record: View ? View.prototype.multi_record : undefined,
- accesskey: View ? View.prototype.accesskey : undefined,
- icon: View ? View.prototype.icon : undefined,
+ button_label: _.str.sprintf(_t('%(view_type)s view'), {'view_type': (view_label || view_type)}),
+ multi_record: View.prototype.multi_record,
+ accesskey: View.prototype.accesskey,
+ icon: View.prototype.icon,
};
self.view_order.push(view_descr);
self.views[view_type] = view_descr;