[Rt-commit] rt branch, 4.0/reminders-of-deleted-tickets, updated. rt-4.0.5-89-gbb5f14a

[Alex Vandiver]

The branch, 4.0/reminders-of-deleted-tickets has been updated
       via  bb5f14a2ad755ebe0df4c4b131364570fa0648b1 (commit)
       via  2fb64360885875b5c9951126e8f91eb466b5595c (commit)
      from  edf01b4a56ae4fabcbf0da03a087cf9461a2db17 (commit)

Summary of changes:
 share/html/Ticket/Elements/Reminders   |    5 ++++-
 share/html/Ticket/Elements/ShowSummary |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 2fb64360885875b5c9951126e8f91eb466b5595c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Mar 23 18:54:58 2012 -0400

    Don't show the New reminder box on deleted tickets

diff --git a/share/html/Ticket/Elements/Reminders b/share/html/Ticket/Elements/Reminders
index 563b0f0..26c105f 100644
--- a/share/html/Ticket/Elements/Reminders
+++ b/share/html/Ticket/Elements/Reminders
@@ -111,8 +111,10 @@ my $reminder_collection = $count_reminders->Collection;
 % }
 % }
 
+% if ($Ticket->Status ne "deleted") {
 <&|/l&>New reminder:</&>
 <& SELF:NewReminder, Ticket => $Ticket &>
+% }
 <%method NewReminder>
 <%args>
 $Ticket

commit bb5f14a2ad755ebe0df4c4b131364570fa0648b1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Mar 23 18:55:58 2012 -0400

    Don't show the "Save" button if there are no reminders and new ones can't be created

diff --git a/share/html/Ticket/Elements/Reminders b/share/html/Ticket/Elements/Reminders
index 26c105f..354c1cc 100644
--- a/share/html/Ticket/Elements/Reminders
+++ b/share/html/Ticket/Elements/Reminders
@@ -66,6 +66,7 @@ my $has_reminders = $count_tickets->Count;
 
 # We've made changes, let's reload our search
 my $reminder_collection = $count_reminders->Collection;
+my $visible = 0;
 </%init>
 <input type="hidden" class="hidden" name="id" value="<% $Ticket->id %>" />
 <input type="hidden" class="hidden" name="update-reminders" value="1" />
@@ -82,7 +83,6 @@ my $reminder_collection = $count_reminders->Collection;
 % }
 </tr>
 % my $i = 0;
-% my $visible = 0;
 % while ( my $reminder = $reminder_collection->Next ) {
 % $i++;
 % if ( $reminder->Status eq 'resolved' && !$ShowCompleted ) {
@@ -115,6 +115,7 @@ my $reminder_collection = $count_reminders->Collection;
 <&|/l&>New reminder:</&>
 <& SELF:NewReminder, Ticket => $Ticket &>
 % }
+% return($Ticket->Status ne "deleted" or $visible);
 <%method NewReminder>
 <%args>
 $Ticket
diff --git a/share/html/Ticket/Elements/ShowSummary b/share/html/Ticket/Elements/ShowSummary
index 92e550e..5cb00b7 100755
--- a/share/html/Ticket/Elements/ShowSummary
+++ b/share/html/Ticket/Elements/ShowSummary
@@ -76,8 +76,9 @@
     &>
         <table><tr><td>
             <form action="<%RT->Config->Get('WebPath')%>/Ticket/Display.html" name="UpdateReminders" id="UpdateReminders" method="post">
-                <& /Ticket/Elements/Reminders, Ticket => $Ticket, ShowCompleted => 0 &>
+% if ( $m->comp("/Ticket/Elements/Reminders", Ticket => $Ticket, ShowCompleted => 0) ) {
                 <div align="right"><input type="submit" class="button" value="<&|/l&>Save</&>" /></div>
+% }
             </form>
         </td></tr></table>
     </&>

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