Merge lp:~openerp-dev/openobject-addons/7.0-kanban-import-link-xmo into lp:openobject-addons/7.0

Proposed by Xavier (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-kanban-import-link-xmo
Merge into: lp:openobject-addons/7.0
Diff against target: 100 lines (+74/-0)
4 files modified
base_import_kanban/__openerp__.py (+15/-0)
base_import_kanban/static/src/css/import.css (+14/-0)
base_import_kanban/static/src/js/import.js (+37/-0)
base_import_kanban/static/src/xml/import.xml (+8/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-kanban-import-link-xmo
Reviewer Review Type Date Requested Status
Fabien Meghazi (OpenERP) (community) Approve
Review via email: mp+146385@code.launchpad.net

Description of the change

Adds a link to the import action in ungrouped ("gallery") kanban views, as requested in task 4961

To post a comment you must log in.
Revision history for this message
Fabien Meghazi (OpenERP) (fme) wrote :

Seems good to me.

Just one thing, I tried to import a jpg file but couldn't :

http://i.imgur.com/iiDIfO4.png

review: Approve

Unmerged revisions

8652. By Xavier (Open ERP)

[FIX] hide alternative actions when grouped-but-not-by-m2o

8651. By Xavier (Open ERP)

[ADD] import link to ungrouped kanban views ('gallery')

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'base_import_kanban'
2=== added file 'base_import_kanban/__init__.py'
3=== added file 'base_import_kanban/__openerp__.py'
4--- base_import_kanban/__openerp__.py 1970-01-01 00:00:00 +0000
5+++ base_import_kanban/__openerp__.py 2013-02-04 11:30:31 +0000
6@@ -0,0 +1,15 @@
7+{
8+ 'name': 'Base Import Kanban extensions',
9+ 'description': """
10+Adds *import* link to ungrouped kanban views.
11+""",
12+ 'category': 'Uncategorized',
13+ 'website': 'http://www.openerp.com',
14+ 'author': 'OpenERP SA',
15+ 'depends': ['web_kanban', 'base_import'],
16+ 'installable': True,
17+ 'auto_install': True,
18+ 'js': ['static/src/js/import.js'],
19+ 'css': ['static/src/css/import.css'],
20+ 'qweb': ['static/src/xml/import.xml'],
21+}
22
23=== added directory 'base_import_kanban/static'
24=== added directory 'base_import_kanban/static/src'
25=== added directory 'base_import_kanban/static/src/css'
26=== added file 'base_import_kanban/static/src/css/import.css'
27--- base_import_kanban/static/src/css/import.css 1970-01-01 00:00:00 +0000
28+++ base_import_kanban/static/src/css/import.css 2013-02-04 11:30:31 +0000
29@@ -0,0 +1,14 @@
30+.openerp .oe_kanban_buttons .oe_alternative.oe_kanban_grouped {
31+ display: none;
32+}
33+.openerp .oe_kanban_buttons .oe_alternative .oe_kanban_add_column {
34+ display: none;
35+}
36+.openerp .oe_kanban_buttons .oe_alternative.oe_kanban_grouped_m2o .oe_kanban_add_column {
37+ display: inline;
38+}
39+
40+.openerp .oe_kanban_buttons .oe_alternative.oe_kanban_grouped .oe_kanban_button_import,
41+.openerp .oe_kanban_buttons .oe_alternative.oe_kanban_grouped_m2o .oe_kanban_button_import {
42+ display: none;
43+}
44
45=== added directory 'base_import_kanban/static/src/js'
46=== added file 'base_import_kanban/static/src/js/import.js'
47--- base_import_kanban/static/src/js/import.js 1970-01-01 00:00:00 +0000
48+++ base_import_kanban/static/src/js/import.js 2013-02-04 11:30:31 +0000
49@@ -0,0 +1,37 @@
50+openerp.base_import_kanban = function (instance) {
51+ instance.web_kanban.KanbanView.include({
52+ load_kanban: function () {
53+ var self = this;
54+ var loaded = this._super.apply(this, arguments);
55+ this.$buttons.on('click', '.oe_kanban_button_import', function() {
56+ self.do_action({
57+ type: 'ir.actions.client',
58+ tag: 'import',
59+ params: {
60+ model: self.dataset.model
61+ }
62+ }, {
63+ on_reverse_breadcrumb: function () {
64+ self.reload();
65+ },
66+ });
67+ return false;
68+ });
69+ return loaded;
70+ },
71+ do_search: function () {
72+ var self = this;
73+ return this._super.apply(this, arguments).then(function () {
74+ var $links = self.$buttons.find('.oe_alternative');
75+ $links.css('display', '').removeClass(
76+ 'oe_kanban_grouped_m2o oe_kanban_grouped');
77+
78+ if (self.grouped_by_m2o) {
79+ $links.addClass('oe_kanban_grouped_m2o');
80+ } else if (self.group_by) {
81+ $links.addClass('oe_kanban_grouped');
82+ }
83+ });
84+ }
85+ });
86+};
87
88=== added directory 'base_import_kanban/static/src/xml'
89=== added file 'base_import_kanban/static/src/xml/import.xml'
90--- base_import_kanban/static/src/xml/import.xml 1970-01-01 00:00:00 +0000
91+++ base_import_kanban/static/src/xml/import.xml 2013-02-04 11:30:31 +0000
92@@ -0,0 +1,8 @@
93+<templates>
94+ <t t-extend="KanbanView.buttons">
95+ <!-- display:none on oe_alternative removed in JS override -->
96+ <t t-jquery="span.oe_alternative .oe_bounce_container" t-operation="append">
97+ <a href="#" class="oe_bold oe_kanban_button_import">Import</a>
98+ </t>
99+ </t>
100+</templates>