[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.5-63-g9458745

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  9458745a66de9875843457f5cd688fbfa62d572e (commit)
       via  2ae6c3ff46573149fcf83b3f721604b9057f85ab (commit)
      from  4281fa28f0ed48b55985ca2dcaf4020f7851d4a9 (commit)

Summary of changes:
 share/html/Ticket/Elements/ShowGroupMembers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 2ae6c3ff46573149fcf83b3f721604b9057f85ab
Author: Emmanuel Lacour <elacour at easter-eggs.com>
Date:   Thu Jun 12 11:02:34 2014 +0200

    Fix wrong path for "AboutThisUser" callback in ShowGroupMembers
    
    Since caller() returns where the sub was called in ShowPrincipal,
    9d852519 unintentionally moved this callback to
    /Elements/ShowPrincipal/AboutThisUser from
    /Ticket/Elements/ShowGroupMembers/AboutThisUser -- move it back.
    
    Fies I#30098

diff --git a/share/html/Ticket/Elements/ShowGroupMembers b/share/html/Ticket/Elements/ShowGroupMembers
index f76d727..7d7b3ac 100644
--- a/share/html/Ticket/Elements/ShowGroupMembers
+++ b/share/html/Ticket/Elements/ShowGroupMembers
@@ -50,7 +50,7 @@
 my $post_user = sub {
     my $user = shift;
     $m->comp("/Elements/ShowUserEmailFrequency", User => $user, Ticket => $Ticket);
-    $m->callback( User => $user, Ticket => $Ticket, %ARGS, CallbackName => 'AboutThisUser' );
+    $m->callback( User => $user, Ticket => $Ticket, %ARGS, CallbackName => 'AboutThisUser', CallbackPage => '/Ticket/Elements/ShowGroupMembers' );
 };
 $m->comp("/Elements/ShowPrincipal", Object => $Group, Separator => "<br />", PostUser => $post_user, Link => $Link);
 </%init>

commit 9458745a66de9875843457f5cd688fbfa62d572e
Merge: 4281fa2 2ae6c3f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jun 23 20:11:23 2014 -0400

    Merge branch '4.2/fix-callback-path' into 4.2-trunk


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