diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 5ed0c8326f4..7a52f289f8f 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -535,12 +535,14 @@ class Home(http.Controller): def web_client(self, s_action=None, db=None, debug=False, **kw): debug = debug != False - lst = http.db_list(True) + try: + lst = http.db_list() + except openerp.exceptions.AccessDenied: + lst = [] + if db not in lst: db = None guessed_db = http.db_monodb(request.httprequest) - if guessed_db is None and len(lst) > 0: - guessed_db = lst[0] def redirect(db): query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True)) @@ -548,8 +550,11 @@ class Home(http.Controller): redirect = request.httprequest.path + '?' + urllib.urlencode(query) return redirect_with_hash(redirect) - if db is None and guessed_db is not None: - return redirect(guessed_db) + if guessed_db is None and db is None and lst: + return redirect(lst[0]) + + if guessed_db is None and lst: + guessed_db = lst[0] if db is not None and db != guessed_db: request.session.logout() diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index e086678c937..5e97a708a32 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1733,7 +1733,10 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ var $name = this.$('input:first'); var private_filter = !this.$('#oe_searchview_custom_public').prop('checked'); var set_as_default = this.$('#oe_searchview_custom_default').prop('checked'); - + if (_.isEmpty($name.val())){ + this.do_warn(_t("Error"), _t("Filter name is required.")); + return false; + } var search = this.view.build_search_data(); instance.web.pyeval.eval_domains_and_contexts({ domains: search.domains, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f7cde7ce54d..513e42bf899 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1666,8 +1666,8 @@