Merge lp:~unifield-team/unifield-web/web_UF_1928 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4706
Proposed branch: lp:~unifield-team/unifield-web/web_UF_1928
Merge into: lp:unifield-web
Diff against target: 43 lines (+15/-17)
1 file modified
addons/openerp/widgets/templates/viewform.mako (+15/-17)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/web_UF_1928
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+157595@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/templates/viewform.mako'
2--- addons/openerp/widgets/templates/viewform.mako 2013-03-01 14:17:19 +0000
3+++ addons/openerp/widgets/templates/viewform.mako 2013-04-08 07:28:28 +0000
4@@ -38,24 +38,22 @@
5 % endif
6 </td>
7 <td align="right">
8- % if search.model not in ['account.move.line', 'account.move']:
9- <select name="filter_list" id="filter_list"
10- onchange="change_filter(); return false;">
11- <option value="blk">-- ${_("Filters")} --</option>
12- % if len(search.filters_list):
13- <optgroup id="filter_list_options_group" label="${_('Saved Filters')}">
14- % for f in search.filters_list:
15- <option id="${f[3]}" value="${f[0]}" group_by="${f[2]}">${f[1]}</option>
16- % endfor
17- </optgroup>
18- % endif
19- <optgroup label="${_('Actions')}">
20- <option value="nf">${_("New Filter")}</option>
21- <option value="sf">${_("Save Filter")}</option>
22- <option value="mf">${_("Manage Filters")}</option>
23+ <select name="filter_list" id="filter_list"
24+ onchange="change_filter(); return false;">
25+ <option value="blk">-- ${_("Filters")} --</option>
26+ % if len(search.filters_list):
27+ <optgroup id="filter_list_options_group" label="${_('Saved Filters')}">
28+ % for f in search.filters_list:
29+ <option id="${f[3]}" value="${f[0]}" group_by="${f[2]}">${f[1]}</option>
30+ % endfor
31 </optgroup>
32- </select>
33- % endif
34+ % endif
35+ <optgroup label="${_('Actions')}">
36+ <option value="nf">${_("New Filter")}</option>
37+ <option value="sf">${_("Save Filter")}</option>
38+ <option value="mf">${_("Manage Filters")}</option>
39+ </optgroup>
40+ </select>
41 </td>
42 </tr>
43 </table>

Subscribers

People subscribed via source and target branches

to all changes: