[Rt-commit] [rtir] 01/01: EditLinks no longer offers Merging

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch 3.2-trunk
in repository rtir.

commit 4d7fdaf96130e65756af569ec7a627c4f87e0a59
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Oct 3 15:22:20 2014 -0400

    EditLinks no longer offers Merging
    
    The Merge code was moved out of EditLinks (where it was controled by an
    argument) into a Ticket specific Element.  Call that ticket code which
    gets us the fenced off Merge box from core.
---
 html/RTIR/Advanced.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/html/RTIR/Advanced.html b/html/RTIR/Advanced.html
index 2892e3c..8a9d5ea 100644
--- a/html/RTIR/Advanced.html
+++ b/html/RTIR/Advanced.html
@@ -98,7 +98,11 @@
 </&>
 
 <&| /Widgets/TitleBox, title => loc('Edit Links') &>
-<& /Elements/EditLinks, Object => $Ticket, Merge => 1 &>
+<& /Elements/EditLinks, Object => $Ticket &>
+</&>
+
+<&| /Widgets/TitleBox, title => loc('Merge'), class=>'ticket-info-merge' &>
+<& /Ticket/Elements/EditMerge, Ticket => $Ticket, %ARGS &>
 </&>
 
 <& /Elements/Submit,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.