[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 3859 rev-id: dle@openerp.com-20131023110926-tc2n3oqg0l2ga138

bzr revid: dle@openerp.com-20131023113414-mlwppd4d7vyh1tyj

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()

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,

addons/web/static/src/xml/base.xml

@@ -1666,8 +1666,8 @@
         <ul class="oe_searchview_custom_list"/>
         <div class="oe_searchview_custom">
             <h4>Save current filter</h4>
-            <form>
-                <p><input id="oe_searchview_custom_input" placeholder="Filter name"/></p>
+            <form class="oe_form">
+                <p class="oe_form_required"><input id="oe_searchview_custom_input" placeholder="Filter name"/></p>
                 <p>
                     <input id="oe_searchview_custom_public" type="checkbox"/>
                     <label for="oe_searchview_custom_public">Share with all users</label>

addons/web/static/test/search.js

@@ -1293,7 +1293,7 @@ openerp.testing.section('search.filters.saved', {
         return view.appendTo($fix)
         .then(function () {
             $fix.find('.oe_searchview_custom input#oe_searchview_custom_input')
-                    .text("filter name")
+                    .val("filter name")
                 .end()
                 .find('.oe_searchview_custom button').click();
             return done.promise();