diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2012-09-16 19:10:15 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2012-09-16 19:10:15 +0200 |
| commit | 5000fffb1e9462b01de17a7d5f07d19bc7bad3f7 (patch) | |
| tree | 710681d4aa681f84376255fe9e2c8fcb5e9ae524 /addons/base_setup | |
| parent | 8985e6aea9fc4d10609bc93270ebf97d26a89062 (diff) | |
| parent | 378b77a5e4e79ac761e6c072591fd84a295eb1bf (diff) | |
[MERGE] merging notes + small cleaning
bzr revid: fp@openerp.com-20120916171015-e0n1lq2a5c10a0nb
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/res_partner_view.xml | 8 | ||||
| -rw-r--r-- | addons/base_setup/static/src/js/base_setup.js | 24 |
2 files changed, 5 insertions, 27 deletions
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml index 5aa24b3474d..5e54c0b8629 100644 --- a/addons/base_setup/res_partner_view.xml +++ b/addons/base_setup/res_partner_view.xml @@ -9,9 +9,11 @@ <field name="inherit_id" ref="base.res_partner_kanban_view"/> <field name="arch" type="xml"> <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside"> - <t t-foreach="record.category_id.raw_value" t-as="category"> - <span class="oe_tag" t-att-data-category_id="category"/> - </t> + <span class="oe_kanban_list_many2many" data-model="res.partner.category"> + <t t-foreach="record.category_id.raw_value" t-as="category"> + <span class="oe_tag" t-att-data-list_id="category"/> + </t> + </span> </xpath> </field> </record> diff --git a/addons/base_setup/static/src/js/base_setup.js b/addons/base_setup/static/src/js/base_setup.js deleted file mode 100644 index db217b71b38..00000000000 --- a/addons/base_setup/static/src/js/base_setup.js +++ /dev/null @@ -1,24 +0,0 @@ -openerp.base_setup = function(openerp) { - /* extend kanban to include the names of partner categories in the kanban view of partners */ - openerp.web_kanban.KanbanView.include({ - on_groups_started: function() { - var self = this; - self._super.apply(this, arguments); - if (this.dataset.model === 'res.partner') { - /* Set names for partner categories */ - var category_ids = []; - this.$el.find('.oe_kanban_partner_categories span').each(function() { - category_ids.push($(this).data('category_id')); - }); - var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context); - dataset.name_get(_.uniq(category_ids)).then(function(result) { - _.each(result, function(value) { - self.$el - .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']') - .html(value[1]); - }); - }); - } - } - }); -}; |