[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-177-g10572e2

[Thomas Sibley]

The branch, 3.8-trunk has been updated
       via  10572e20930fb78647124ee3ec30c046d0acf797 (commit)
       via  280bdc1961def7707392ba828f29a4ea8882163a (commit)
      from  87e5c159689c48631623cb135b6d7383310edf24 (commit)

Summary of changes:
 share/html/SelfService/Display.html |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 280bdc1961def7707392ba828f29a4ea8882163a
Author: Matt Zagrabelny <mzagrabe at d.umn.edu>
Date:   Thu Oct 21 12:19:26 2010 -0500

    Link the Basics title in SelfService/Display.html to the Update page
    
    Conditionally, if user has ModifyTicket right, make 'The Basics' title a
    link in /SelfService/Display.html. Link will be to
    SelfService/Update.html, with the possibility to override using a
    callback.

diff --git a/share/html/SelfService/Display.html b/share/html/SelfService/Display.html
index c796109..df6bd16 100755
--- a/share/html/SelfService/Display.html
+++ b/share/html/SelfService/Display.html
@@ -54,8 +54,9 @@
   <table width="100%" class="ticketsummary" >
       <tr>
         <td valign="top" width="50%" class="boxcontainer">
-          <&| /Widgets/TitleBox, title => loc('The Basics'), 
-                title_class=> 'inverse',  
+          <&| /Widgets/TitleBox, title => loc('The Basics'),
+                ($Ticket->CurrentUserHasRight('ModifyTicket') ? (title_href => $title_box_link) : ()),
+                title_class=> 'inverse',
                 color => "#993333" &>
                 <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
                 <& /Ticket/Elements/ShowCustomFields, Ticket => $Ticket &>
@@ -224,7 +225,8 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) {
     my $attachments =
       $m->comp( '/Ticket/Elements/FindAttachments', Ticket => $Ticket );
 
-    $m->callback(CallbackName => 'BeforeDisplay', Ticket => \$Ticket, ARGSRef => \%ARGS);
+    my $title_box_link = RT->Config->Get('WebPath')."/SelfService/Update.html?id=".$Ticket->Id;
+    $m->callback(CallbackName => 'BeforeDisplay', Ticket => \$Ticket, ARGSRef => \%ARGS, title_box_link => \$title_box_link);
 </%INIT>
 
 

commit 10572e20930fb78647124ee3ec30c046d0acf797
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Oct 26 12:10:56 2010 -0400

    Also show The Basics link on SelfService with right ReplyToTicket

diff --git a/share/html/SelfService/Display.html b/share/html/SelfService/Display.html
index df6bd16..5cb278d 100755
--- a/share/html/SelfService/Display.html
+++ b/share/html/SelfService/Display.html
@@ -55,7 +55,7 @@
       <tr>
         <td valign="top" width="50%" class="boxcontainer">
           <&| /Widgets/TitleBox, title => loc('The Basics'),
-                ($Ticket->CurrentUserHasRight('ModifyTicket') ? (title_href => $title_box_link) : ()),
+                ($LinkBasicsTitle ? (title_href => $title_box_link) : ()),
                 title_class=> 'inverse',
                 color => "#993333" &>
                 <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
@@ -225,6 +225,8 @@ if ( defined ($id[0]) && $id[0] eq 'new' ) {
     my $attachments =
       $m->comp( '/Ticket/Elements/FindAttachments', Ticket => $Ticket );
 
+    my $LinkBasicsTitle = $Ticket->CurrentUserHasRight('ModifyTicket')
+                          || $Ticket->CurrentUserHasRight('ReplyToTicket');
     my $title_box_link = RT->Config->Get('WebPath')."/SelfService/Update.html?id=".$Ticket->Id;
     $m->callback(CallbackName => 'BeforeDisplay', Ticket => \$Ticket, ARGSRef => \%ARGS, title_box_link => \$title_box_link);
 </%INIT>

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