Christophe Matthieu (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-note-tag-chm into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-note-tag-chm/+merge/123702
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-note-tag-chm/+merge/123702
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-note-tag-chm.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2012-09-11 06:36:07 +0000
+++ addons/web/static/src/css/base.css 2012-09-11 09:57:23 +0000
@@ -687,6 +687,7 @@
.openerp .oe_dropdown_toggle {
color: #404040;
font-weight: normal;
+ display:inline-block;
}
.openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
display: block;
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2012-09-11 06:36:07 +0000
+++ addons/web/static/src/css/base.sass 2012-09-11 09:57:23 +0000
@@ -559,6 +559,7 @@
.oe_dropdown_toggle
color: #404040
font-weight: normal
+ display:inline-block
.oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
display: block
.oe_dropdown_menu
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2012-09-10 11:57:12 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2012-09-11 09:57:23 +0000
@@ -136,6 +136,7 @@
margin-left: 4px;
cursor: pointer;
position: relative;
+ display: inline-block;
top: -8px;
}
.openerp .oe_kanban_view .oe_kanban_add {
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass 2012-09-10 11:57:12 +0000
+++ addons/web_kanban/static/src/css/kanban.sass 2012-09-11 09:57:23 +0000
@@ -149,6 +149,7 @@
margin-left: 4px
cursor: pointer
position: relative
+ display: inline-block
top: -8px
.oe_kanban_add
float: right
=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js 2012-09-06 17:42:05 +0000
+++ addons/web_kanban/static/src/js/kanban.js 2012-09-11 09:57:23 +0000
@@ -163,6 +163,44 @@
}
}
},
+ transform_list_many2many: function(){
+ var self = this;
+
+ /* Set the lists of tag/categories */
+ var blocks = self.$el.find('.oe_kanban_list_many2many');
+ for(var i=0;i<blocks.length;i++){
+
+ var block = $(blocks[i]);
+
+ //select the model
+ var model = block.data('model');
+ if(!model||model.length<1) console.log("Error : no data-model on a field : .oe_kanban_list_many2many");
+
+ // select all ids
+ var list_ids = [];
+ block.find('[data-list_id]').each(function() {
+ list_ids.push( $(this).data('list_id') );
+ });
+
+
+ if(list_ids.length>0){
+ // request
+ var dataset = new instance.web.DataSetSearch(self, model, self.session.context);
+ dataset.name_get(_.uniq(list_ids)).then(
+ function(result) {
+ for(var t=0;t<result.length;t++){
+ self.$el.find(".oe_kanban_list_many2many [data-list_id='" + result[t][0] + "']").html(result[t][1]);
+ }
+ },
+ function(r){
+ console.log('Error',r);
+ }
+ );
+ }
+
+ }
+
+ },
do_add_record: function() {
this.dataset.index = null;
this.do_switch_view('form');
@@ -350,6 +388,8 @@
} else {
this.$el.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle');
}
+
+ this.transform_list_many2many();
},
on_record_moved : function(record, old_group, old_index, new_group, new_index) {
var self = this;
@@ -757,7 +797,7 @@
}
});
- if (this.$el.find('.oe_kanban_global_click').length) {
+ if (this.$el.find('.oe_kanban_global_click,.oe_kanban_global_click_edit').length) {
this.$el.on('click', function(ev) {
if (!ev.isTrigger && !$(ev.target).data('events')) {
var trigger = true;
@@ -798,8 +838,15 @@
});
}
},
+ /* actions when user click on the block with a specific class
+ * open on normal view : oe_kanban_global_click
+ * open on form/edit view : oe_kanban_global_click_edit
+ */
on_card_clicked: function(ev) {
- this.view.open_record(this.id);
+ if(this.$el.find('.oe_kanban_global_click_edit').size()>0)
+ this.do_action_edit();
+ else
+ this.do_action_open();
},
setup_color_picker: function() {
var self = this;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
