[Rt-commit] rt branch, 4.6/inline-edit, updated. rt-4.4.1-184-g08d2ed5

[Shawn Moore]

The branch, 4.6/inline-edit has been updated
       via  08d2ed57535cc33c57e7065351ded5d79567025e (commit)
      from  4fa6073ca5c4f8f88bec7c3ac0758a9101aa0e8e (commit)

Summary of changes:
 share/html/Ticket/Elements/ShowSummary | 4 ++++
 1 file changed, 4 insertions(+)

- Log -----------------------------------------------------------------
commit 08d2ed57535cc33c57e7065351ded5d79567025e
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Tue Dec 27 18:45:07 2016 +0000

    Add ticket merge to inline edit for Links
    
    Fixes: T#178728

diff --git a/share/html/Ticket/Elements/ShowSummary b/share/html/Ticket/Elements/ShowSummary
index 9c5c7c7..cc32c66 100644
--- a/share/html/Ticket/Elements/ShowSummary
+++ b/share/html/Ticket/Elements/ShowSummary
@@ -150,6 +150,10 @@ push @extra, (titleright_raw => $links_titleright) if $links_titleright;
             <form class="inline-edit" action="<%RT->Config->Get('WebPath')%>/Ticket/Display.html" method="post">
                 <input type="hidden" class="hidden" name="id" value="<% $Ticket->id %>" />
                 <& /Elements/EditLinks, Object => $Ticket, TwoColumn => 0 &>
+
+                <h3><&|/l&>Merge</&></h3>
+                <& /Ticket/Elements/EditMerge, Ticket => $Ticket, %ARGS &>
+
                 <div align="right"><input type="submit" class="button" value="<&|/l&>Save</&>" /></div>
             </form>
 %       }

-----------------------------------------------------------------------