[MERGE] forward port branch saas-15 up to 970be94f37

2017-12-05 16:46:14 +01:00
parent 519555054a 970be94f37
commit b8540eefe3
10 changed files with 109 additions and 62 deletions
@@ -339,7 +339,7 @@ var SearchView = Widget.extend({
    },
    set_default_filters: function () {
        var self = this,
-            default_custom_filter = this.$buttons && this.favorite_menu.get_default_filter();
+            default_custom_filter = this.$buttons && this.favorite_menu && this.favorite_menu.get_default_filter();
        if (!self.options.disable_custom_filters && default_custom_filter) {
            return this.favorite_menu.toggle_filter(default_custom_filter, true);
        }