Unifield Web

Merge lp:~unifield-team/unifield-web/utp-443 into lp:unifield-web

  1. utp-443
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4680
Proposed branch: lp:~unifield-team/unifield-web/utp-443
Merge into: lp:unifield-web
Diff against target: 29 lines (+4/-1)
2 files modified
addons/openerp/widgets/sidebar.py (+2/-1)
addons/openerp/widgets/templates/sidebar.mako (+2/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/utp-443
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+143245@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/widgets/sidebar.py'
2--- addons/openerp/widgets/sidebar.py 2011-01-17 11:57:11 +0000
3+++ addons/openerp/widgets/sidebar.py 2013-01-15 08:38:26 +0000
4@@ -43,7 +43,8 @@
5 self.view_type = view_type
6 toolbar = toolbar or {}
7 submenu = submenu
8- self.id = id or None
9+ self.id = id or None
10+ self.model = model
11 self.reports = toolbar.get('print', [])
12 self.actions = toolbar.get('action', [])
13 self.relates = toolbar.get('relate', [])
14
15=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
16--- addons/openerp/widgets/templates/sidebar.mako 2012-08-09 14:04:10 +0000
17+++ addons/openerp/widgets/templates/sidebar.mako 2013-01-15 08:38:26 +0000
18@@ -107,9 +107,11 @@
19 </div>
20 <ul class="clean-a">
21 % if view_type == 'tree':
22+ % if model != 'product.product':
23 <li>
24 <a href="javascript: void(0)" onclick="new ListView('_terp_list').importData()">${_("Import")}</a>
25 </li>
26+ % endif
27 <li>
28 <a href="javascript: void(0)" onclick="new ListView('_terp_list').exportData()">${_("Export")}</a>
29 </li>

Subscribers

People subscribed via source and target branches

to all changes: