[MERGE] merge trunk
bzr revid: chm@openerp.com-20120919075038-urm5g8mixi7k5f9p
This commit is contained in:
commit
a3351d5d0f
|
@ -71,9 +71,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
|
||||||
this.fields_keys = _.keys(this.fields_view.fields);
|
this.fields_keys = _.keys(this.fields_view.fields);
|
||||||
this.add_qweb_template();
|
this.add_qweb_template();
|
||||||
this.has_been_loaded.resolve();
|
this.has_been_loaded.resolve();
|
||||||
|
|
||||||
this._super.apply(this, arguments);
|
this._super.apply(this, arguments);
|
||||||
|
|
||||||
return $.when();
|
return $.when();
|
||||||
},
|
},
|
||||||
_is_quick_create_enabled: function() {
|
_is_quick_create_enabled: function() {
|
||||||
|
@ -862,7 +860,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
|
||||||
if(this.$el.find('.oe_kanban_global_click_edit').size()>0)
|
if(this.$el.find('.oe_kanban_global_click_edit').size()>0)
|
||||||
this.do_action_edit();
|
this.do_action_edit();
|
||||||
else
|
else
|
||||||
this.do_action_open();
|
this.do_action_open();
|
||||||
},
|
},
|
||||||
setup_color_picker: function() {
|
setup_color_picker: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
Loading…
Reference in New Issue