Merge lp:~openerp-dev/openobject-addons/trunk-bug-1062904-vja into lp:openobject-addons

Proposed by Vishmita Jadeja (openerp)
Status: Rejected
Rejected by: Fabien (Open ERP)
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1062904-vja
Merge into: lp:openobject-addons
Diff against target: 16 lines (+6/-0)
1 file modified
process/static/src/js/process.js (+6/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1062904-vja
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo (community) Approve
Jiten (OpenERP) (community) Approve
OpenERP Core Team Pending
Review via email: mp+129802@code.launchpad.net

Description of the change

Link to documentation in process view

To post a comment you must log in.
Revision history for this message
Jiten (OpenERP) (jiten-openerp) :
review: Approve
Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

For me it is core business, please merge ASAP. thanks!

review: Approve
Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

was already fixed.

Unmerged revisions

7780. By Vishmita Jadeja (openerp)

[FIX]Link to doc dessappear on process view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'process/static/src/js/process.js'
2--- process/static/src/js/process.js 2012-10-15 13:33:34 +0000
3+++ process/static/src/js/process.js 2012-10-16 05:52:25 +0000
4@@ -176,6 +176,12 @@
5 var notes = new_notes.substring(0,60) +'..';
6 }
7 r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"});
8+ var DOC_URL = "http://doc.openerp.com/v6.1/index.php";
9+ r['image']('/web/static/src/img/icons/gtk-info.png', nodes.x, nodes.y+75, 16, 16)
10+ .attr({"cursor": "pointer", "title": "Help"})
11+ .click(function() {
12+ window.open(nodes.url || DOC_URL + "?model=" + nodes.model);
13+ });
14 if(nodes.menu) {
15 r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16)
16 .attr({"cursor": "pointer", "title": nodes.menu.name})

Subscribers

People subscribed via source and target branches

to all changes: