tfr (Openerp) has proposed merging lp:~openerp-dev/openerp-int/mck_create_once
into lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_create_once/+merge/141358
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_create_once/+merge/141358
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_create_once into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_web_addons/static/src/js/change_m2o.js'
--- mck_web_addons/static/src/js/change_m2o.js 2012-11-23 10:36:39 +0000
+++ mck_web_addons/static/src/js/change_m2o.js 2012-12-27 14:44:58 +0000
@@ -11,8 +11,8 @@
var init_context_menu_def = $.Deferred().then(function(e) {
var rdataset = new openerp.web.DataSetStatic(self, "ir.values", self.build_context());
rdataset.call("get", ['action', 'client_action_relate',
- [[self.field.relation, false]], false, rdataset.get_context()], false, 0)
- .then(function(result) {
+ [[self.field.relation, false]], false, rdataset.get_context()], false, 0)
+ .pipe(function(result) {
self.related_entries = result;
var $cmenu = $("#" + self.cm_id);
@@ -23,12 +23,6 @@
return;
self._search_create_popup("search");
};
- var dataset = new openerp.web.DataSetStatic(this, self.field.relation);
- dataset.call('check_create',[false], function(data){
- if(!data) {
- self.$element.find('#' + self.cm_id + "_create").remove();
- }
- })
bindings[self.cm_id + "_create"] = function() {
if (self.readonly)
return;
@@ -72,11 +66,21 @@
return true;
}, menuStyle: {width: "72px"}
});
- $.async_when().then(function() {self.$menu_btn.trigger(e);});
+
+ return new openerp.web.DataSetStatic(this, self.field.relation)
+ .call('check_create',[false], function(data){
+ if(!data) {
+ self.$element.find('#' + self.cm_id + "_create").remove();
+ }
+ });
+ }).then(function () {
+ self.$menu_btn.trigger(e);
});
});
- var ctx_callback = function(e) {init_context_menu_def.resolve(e); e.preventDefault()};
- this.$menu_btn.click(ctx_callback);
+ this.$menu_btn.click(function(e) {
+ init_context_menu_def.resolve(e);
+ e.preventDefault();
+ });
}
});
openerp.mck_web_addons.FormView = openerp.web.FormView.include({
@@ -170,8 +174,7 @@
}
// // create...
- if (self.create_access){
-
+ if (self.create_access){
values.push({label: _t("<em> Create and Edit...</em>"), action: function() {
self._change_int_value(null);
self._search_create_popup("form", undefined, {"default_name": search_val});
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
