[Rt-commit] r3344 - in rt/branches/3.5-TESTING: . html/Elements html/Ticket/Elements

[jesse at bestpractical.com]

Author: jesse
Date: Sun Jul  3 18:55:10 2005
New Revision: 3344

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/EditCustomFieldCombobox
   rt/branches/3.5-TESTING/html/Ticket/Elements/Reminders
Log:
 r22197 at hualien:  jesse | 2005-07-03 18:21:24 -0400
  r21988 at hualien:  jesse | 2005-06-29 10:18:11 -0400
   r21985 at hualien (orig r3262):  alexmv | 2005-06-29 01:25:04 -0400
    r4492 at zoq-fot-pik:  chmrr | 2005-06-28 21:22:25 -0400
     * Only update reminders if we actually were submitting on them
     * Don't open reminders if we didn't have a checkbox for them
   
   r21986 at hualien (orig r3263):  alexmv | 2005-06-29 01:25:11 -0400
    r4493 at zoq-fot-pik:  chmrr | 2005-06-28 21:32:36 -0400
     * Label entry field better
   
   r21987 at hualien (orig r3264):  alexmv | 2005-06-29 01:25:19 -0400
    r4494 at zoq-fot-pik:  chmrr | 2005-06-28 22:03:22 -0400
     * Comboboxes are just one value, not multiple; s/Values/Value/
   
  
 


Modified: rt/branches/3.5-TESTING/html/Elements/EditCustomFieldCombobox
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/EditCustomFieldCombobox	(original)
+++ rt/branches/3.5-TESTING/html/Elements/EditCustomFieldCombobox	Sun Jul  3 18:55:10 2005
@@ -49,7 +49,7 @@
 % }
 % (!$Multiple or !$MaxValues or !$Values or $Values->Count < $MaxValues) or return;
 <& /Widgets/ComboBox,
-    Name    => $NamePrefix . $CustomField->Id . "-Values",
+    Name    => $NamePrefix . $CustomField->Id . "-Value",
     Default => $Default,
     Rows    => $Rows,
     Values  => [map {$_->Name} @{$CustomField->Values->ItemsArrayRef}],

Modified: rt/branches/3.5-TESTING/html/Ticket/Elements/Reminders
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/Elements/Reminders	(original)
+++ rt/branches/3.5-TESTING/html/Ticket/Elements/Reminders	Sun Jul  3 18:55:10 2005
@@ -12,16 +12,15 @@
 
 my $reminder_collection = $Ticket->Reminders->Collection;
 
-while (my $reminder = $reminder_collection->Next) {
-    # If they've just checked the box, make sure we resolve it
-   if ($reminder->Status ne 'resolved'   
-       && $request_args->{'Complete-Reminder-'.$reminder->id}) {
-        $reminder->SetStatus('resolved');
-   }
-   elsif ($reminder->Status eq 'resolved' && ! $request_args->{'Complete-Reminder-'.$reminder->id}) {
-           $reminder->SetStatus('open');
-              }
-
+if ($request_args->{'update-reminders'}) {
+    while (my $reminder = $reminder_collection->Next) {
+        if ($reminder->Status ne 'resolved'   
+            && $request_args->{'Complete-Reminder-'.$reminder->id}) {
+            $reminder->SetStatus('resolved');
+        } elsif ($reminder->Status eq 'resolved' && ! $request_args->{'Complete-Reminder-'.$reminder->id}) {
+            $reminder->SetStatus('open');
+        }
+    }
 }
 
 
@@ -55,11 +54,15 @@
 
 $reminder_collection = $Ticket->Reminders->Collection; 
 </%init>
-<input type="hidden" name="id" value="<%$Ticket->id%>">
+<input type="hidden" name="id" value="<%$Ticket->id%>" />
+<input type="hidden" name="update-reminders" value="1" />
 % while (my $reminder = $reminder_collection->Next) {
-% next if ($reminder->Status eq 'resolved' && !$ShowCompleted);
+% if ($reminder->Status eq 'resolved' && !$ShowCompleted) {
+<input type="hidden" name="Complete-Reminder-<% $reminder->id %>" value="1" />
+% } else {
 <& SELF:ShowEntry, Reminder => $reminder, Ticket => $Ticket &>
 % }
+% }
 <br />
 <br />
 <&|/l&>New reminder:</&><br />
@@ -79,7 +82,7 @@
 <& /Elements/SelectOwner, Name => 'NewReminder-Owner', Queue => $Ticket->QueueObj &>
 </div>
 <div class="horizontal">
-<label class="horizontal" for="NewReminder-Due" ><&|/l&>Due</&>:</label> 
+<label class="horizontal" for="NewReminder-Due" ><&|/l&>Due</l> <&|/l&>(yyyy/mm/dd)</&>:</label> 
 <input type="text" size="10" name="NewReminder-Due">
 </div>
 </%method>