[IMP] m2m_tags code
bzr revid: xmo@openerp.com-20121107161955-bc7bxmmbdkmr34ix
This commit is contained in:
parent
6f79b279bf
commit
a423c32454
|
@ -3924,11 +3924,11 @@ instance.web.form.One2ManyFormView = instance.web.FormView.extend({
|
||||||
});
|
});
|
||||||
|
|
||||||
var lazy_build_o2m_kanban_view = function() {
|
var lazy_build_o2m_kanban_view = function() {
|
||||||
if (! instance.web_kanban || instance.web.form.One2ManyKanbanView)
|
if (! instance.web_kanban || instance.web.form.One2ManyKanbanView)
|
||||||
return;
|
return;
|
||||||
instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
|
instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, {
|
instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(instance.web.form.CompletionFieldMixin, instance.web.form.ReinitializeFieldMixin, {
|
||||||
template: "FieldMany2ManyTags",
|
template: "FieldMany2ManyTags",
|
||||||
|
@ -3943,7 +3943,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
|
||||||
if (this.get("effective_readonly"))
|
if (this.get("effective_readonly"))
|
||||||
return;
|
return;
|
||||||
var self = this;
|
var self = this;
|
||||||
self.$text = $("textarea", this.$el);
|
self.$text = this.$("textarea");
|
||||||
self.$text.textext({
|
self.$text.textext({
|
||||||
plugins : 'tags arrow autocomplete',
|
plugins : 'tags arrow autocomplete',
|
||||||
autocomplete: {
|
autocomplete: {
|
||||||
|
@ -3967,9 +3967,8 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
|
||||||
},
|
},
|
||||||
tags: {
|
tags: {
|
||||||
isTagAllowed: function(tag) {
|
isTagAllowed: function(tag) {
|
||||||
if (! tag.name)
|
return !!tag.name;
|
||||||
return false;
|
|
||||||
return true;
|
|
||||||
},
|
},
|
||||||
removeTag: function(tag) {
|
removeTag: function(tag) {
|
||||||
var id = tag.data("id");
|
var id = tag.data("id");
|
||||||
|
@ -4001,7 +4000,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
|
||||||
self._drop_shown = true;
|
self._drop_shown = true;
|
||||||
});
|
});
|
||||||
self.tags = self.$text.textext()[0].tags();
|
self.tags = self.$text.textext()[0].tags();
|
||||||
$("textarea", this.$el).focusout(function() {
|
self.$text.focusout(function() {
|
||||||
self.$text.trigger("setInputData", "");
|
self.$text.trigger("setInputData", "");
|
||||||
}).keydown(function(e) {
|
}).keydown(function(e) {
|
||||||
if (e.which === $.ui.keyCode.TAB && self._drop_shown) {
|
if (e.which === $.ui.keyCode.TAB && self._drop_shown) {
|
||||||
|
@ -4026,7 +4025,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
|
||||||
render_value: function() {
|
render_value: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
|
var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
|
||||||
var values = self.get("value")
|
var values = self.get("value");
|
||||||
var handle_names = function(data) {
|
var handle_names = function(data) {
|
||||||
if (self.isDestroyed())
|
if (self.isDestroyed())
|
||||||
return;
|
return;
|
||||||
|
@ -4037,7 +4036,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
|
||||||
data = _.map(values, function(el) { return indexed[el]; });
|
data = _.map(values, function(el) { return indexed[el]; });
|
||||||
if (! self.get("effective_readonly")) {
|
if (! self.get("effective_readonly")) {
|
||||||
self.tags.containerElement().children().remove();
|
self.tags.containerElement().children().remove();
|
||||||
$("textarea", self.$el).css("padding-left", "3px");
|
self.$('textarea').css("padding-left", "3px");
|
||||||
self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};}));
|
self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};}));
|
||||||
} else {
|
} else {
|
||||||
self.$el.html(QWeb.render("FieldMany2ManyTag", {elements: data}));
|
self.$el.html(QWeb.render("FieldMany2ManyTag", {elements: data}));
|
||||||
|
|
Loading…
Reference in New Issue