odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed event name. 

bzr revid: vta@openerp.com-20121018124607-rifo06nfx7jo134e
This commit is contained in:
vta vta@openerp.com 2012-10-18 14:46:07 +02:00
parent 98431bccd9
commit 59aaa765a6
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/static/src/js/search.js
View File

@ -766,7 +766,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
groupbys: groupbys,
errors: errors
};
}, /**
},
/**
* Performs the search view collection of widget data.
*
* If the collection went well (all fields are valid), then triggers
@ -786,7 +787,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
this.on_invalid(search.errors);
return;
}
return this.trigger('data_search', search.domains, search.contexts, search.groupbys);
return this.trigger('search_data', search.domains, search.contexts, search.groupbys);
},
/**
* Triggered after the SearchView has collected all relevant domains and

2
addons/web/static/src/js/view_form.js
View File

@ -4468,7 +4468,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
}
this.searchview = new instance.web.SearchView(this,
this.dataset, false, search_defaults);
this.searchview.on('data_search', self, function(domains, contexts, groupbys) {
this.searchview.on('search_data', self, function(domains, contexts, groupbys) {
if (self.initial_ids) {
self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]),
contexts, groupbys);

2
addons/web/static/src/js/views.js
View File

@ -648,7 +648,7 @@ instance.web.ViewManager = instance.web.Widget.extend({
}
this.searchview = new instance.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false);
this.searchview.on('data_search', self, this.do_searchview_search);
this.searchview.on('search_data', self, this.do_searchview_search);
return this.searchview.appendTo(this.$el.find(".oe_view_manager_view_search"));
},
do_searchview_search: function(domains, contexts, groupbys) {

6
addons/web/static/test/search.js
View File

@ -652,7 +652,7 @@ $(document).ready(function () {
}
});
var ds, cs, gs;
view.on('data_search', this, function (d, c, g) {
view.on('search_data', this, function (d, c, g) {
ds = d, cs = c, gs = g;
});
view.appendTo($fix)
@ -690,7 +690,7 @@ $(document).ready(function () {
}
}, {dummy: 42});
var ds, cs, gs;
view.on('data_search', this, function (d, c, g) {
view.on('search_data', this, function (d, c, g) {
ds = d, cs = c, gs = g;
});
view.appendTo($fix)
@ -718,7 +718,7 @@ $(document).ready(function () {
}
}, {dummy: 42});
var ds;
view.on('data_search', this, function (d) { ds = d; });
view.on('search_data', this, function (d) { ds = d; });
view.appendTo($fix)
.always(start)
.fail(function (error) { ok(false, error.message); })

2
addons/web_hello/static/openerp/base_hello.js
View File

@ -7,7 +7,7 @@ openerp.web_hello = function(instance) {
instance.web.SearchView = instance.web.SearchView.extend({
init:function() {
this._super.apply(this,arguments);
this.on('data_search', this, function(){console.log('hello');});
this.on('search_data', this, function(){console.log('hello');});
}
});