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

Proposed by jftempo
Status: Merged
Merged at revision: 4746
Proposed branch: lp:~unifield-team/unifield-web/utp-1051
Merge into: lp:unifield-web
Diff against target: 45 lines (+12/-0)
1 file modified
addons/openerp/widgets/templates/logs.mako (+12/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/utp-1051
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+239803@code.launchpad.net
To post a comment you must log in.
4747. By Quentin THEURET @Amaris

UTP-1051 [FIX] In case of more logs than 5, if the user cannot read the object of the res.log, don't display a link

4748. By Quentin THEURET @Amaris

UTP-1051 [FIX] Forgot endif statement

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/widgets/templates/logs.mako'
2--- addons/openerp/widgets/templates/logs.mako 2012-04-03 13:52:22 +0000
3+++ addons/openerp/widgets/templates/logs.mako 2014-11-03 14:52:20 +0000
4@@ -8,9 +8,13 @@
5 % for log in logs[:5]:
6 <tr>
7 <td class="logActions">
8+ % if log['read_ok']:
9 <a href="${py.url('/openerp/form/edit', model=log['res_model'], id=log['res_id'], context=log['context'], domain=log['domain'])}">
10 &rarr; ${log['name']}
11 </a>
12+ % else:
13+ <span>&rarr; ${log['name']}</span>
14+ % endif
15 </td>
16 </tr>
17 % endfor
18@@ -24,9 +28,13 @@
19 <div id="more_logs">
20 % for log in logs[5:]:
21 <div>
22+ % if log['read_ok']:
23 <a href="${py.url('/openerp/form/edit', model=log['res_model'], id=log['res_id'], context=log['context'], domain=log['domain'])}">
24 &rarr; ${log['name']}
25 </a>
26+ % else:
27+ <span>&rarr; ${log['name']}</span>
28+ % endif
29 </div>
30 % endfor
31 <a id="less" style="color: blue; font-weight: bold;" href="javascript: void(0);"
32@@ -42,9 +50,13 @@
33 % for log in logs:
34 <tr>
35 <td class="logActions">
36+ % if log['read_ok']:
37 <a href="${py.url('/openerp/form/edit', model=log['res_model'], id=log['res_id'], context=log['context'], domain=log['domain'])}">
38 &rarr; ${log['name']}
39 </a>
40+ % else:
41+ <span>&rarr; ${log['name']}</span>
42+ % endif
43 </td>
44 </tr>
45 % endfor

Subscribers

People subscribed via source and target branches

to all changes: