[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 3748 rev-id: dle@openerp.com-20131023103308-18pj2gqq3imrcir7

bzr revid: dle@openerp.com-20131023110926-tc2n3oqg0l2ga138
This commit is contained in:
Denis Ledoux
2013-10-23 13:09:26 +02:00
3 changed files with 7 additions and 4 deletions
+4 -1
View File
@@ -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,
+2 -2
View File
@@ -1664,8 +1664,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>
+1 -1
View File
@@ -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();