[Rt-commit] rt branch, 4.4/datetime-in-box, created. rt-4.2.10-119-g3b48f21

[Alex Vandiver]

The branch, 4.4/datetime-in-box has been created
        at  3b48f214f5a3d7f98f7b39ddafe1778589fb854d (commit)

- Log -----------------------------------------------------------------
commit 3b48f214f5a3d7f98f7b39ddafe1778589fb854d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Feb 20 17:01:35 2014 -0500

    More changes for Date and Datetime CF values being in their input box
    
    4.4/date-input-keep-value, merged in 53ae8534, made the bulkd of the
    changes necessary for Date and Datetime custom fields to no longer be
    treated specially -- their current values are now shown in the box,
    solving a wide array of bugs.
    
    This commit takes out additional workarounds added in 4.2 since that
    commit.

diff --git a/share/html/Elements/BulkCustomFields b/share/html/Elements/BulkCustomFields
index 259af13..9894bce 100644
--- a/share/html/Elements/BulkCustomFields
+++ b/share/html/Elements/BulkCustomFields
@@ -81,12 +81,12 @@
 <td><& /Elements/EditCustomFieldWikitext, @add &></td>
 <td>
 % } elsif ($cf->Type eq 'Date') {
-<td><& /Elements/EditCustomFieldDate, @add, Default => undef &></td>
-<td><& /Elements/EditCustomFieldDate, @del, Default => undef &><br />
+<td><& /Elements/EditCustomFieldDate, @add &></td>
+<td><& /Elements/EditCustomFieldDate, @del &><br />
 % } elsif ($cf->Type eq 'DateTime') {
 % # Pass datemanip format to prevent another tz date conversion
-<td><& /Elements/EditCustomFieldDateTime, @add, Default => undef, Format => 'datemanip' &></td>
-<td><& /Elements/EditCustomFieldDateTime, @del, Default => undef, Format => 'datemanip' &><br />
+<td><& /Elements/EditCustomFieldDateTime, @add, Format => 'datemanip' &></td>
+<td><& /Elements/EditCustomFieldDateTime, @del, Format => 'datemanip' &><br />
 % } else {
 %   $RT::Logger->crit("Unknown CustomField type: " . $cf->Type);
 %   next
diff --git a/share/html/Elements/EditCustomFieldDate b/share/html/Elements/EditCustomFieldDate
index 4af7641..7e169cf 100644
--- a/share/html/Elements/EditCustomFieldDate
+++ b/share/html/Elements/EditCustomFieldDate
@@ -60,5 +60,4 @@ $Default => undef
 $Values => undef
 $MaxValues => 1
 $Name => undef
-$KeepValue => undef
 </%ARGS>
diff --git a/share/html/Elements/ValidateCustomFields b/share/html/Elements/ValidateCustomFields
index 7c8edde..c374419 100644
--- a/share/html/Elements/ValidateCustomFields
+++ b/share/html/Elements/ValidateCustomFields
@@ -75,12 +75,6 @@ while ( my $CF = $CustomFields->Next ) {
         Value       => ($submitted->{Values} // $submitted->{Value} // $submitted->{Upload}),
     );
     if ($CF->Type =~ /^Date(?:Time)?$/) {
-        if (not @values) {
-            my $values = $Object->CustomFieldValues($CF->Id);
-            while (my $ocfv = $values->Next) {
-                push @values, $ocfv->Content;
-            }
-        }
         @values = grep {
             my $DateObj = RT::Date->new ( $session{'CurrentUser'} );
             $DateObj->Set(
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index e399725..68097b0 100644
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -106,9 +106,8 @@
           CustomFields => $QueueObj->TicketCustomFields,
           Grouping => 'Basics',
           InTable => 1,
-          KeepValue => 1,
       &>
-      <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1, KeepValue => 1, &>
+      <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1 &>
     </table>
   </&>
 % $m->callback( CallbackName => 'AfterBasics', QueueObj => $QueueObj, ARGSRef => \%ARGS );
@@ -117,7 +116,6 @@
     %ARGS,
     Object => $ticket,
     CustomFieldGenerator => sub { $QueueObj->TicketCustomFields },
-    KeepValue => 1,
 &>
 
 </div>
@@ -172,7 +170,6 @@
     CustomFields => $QueueObj->TicketCustomFields,
     Grouping => 'People',
     InTable => 1,
-    KeepValue => 1,
 &>
 
 <tr>
@@ -267,7 +264,6 @@
     CustomFields => $QueueObj->TicketCustomFields,
     Grouping => 'Dates',
     InTable => 1,
-    KeepValue => 1,
 &>
 </table>
 </&>
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index fcf449e..82f9caf 100644
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -114,7 +114,7 @@
     </td>
   </tr>
 
-  <tr><td colspan="2"><& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $Ticket, KeepValue => 1, &></td></tr>
+  <tr><td colspan="2"><& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $Ticket &></td></tr>
 
 <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
 
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index f0b8130..bce5826 100644
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -129,7 +129,7 @@
 
 % $m->callback( %ARGS, CallbackName => 'AfterWorked', Ticket => $TicketObj );
 
-<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj, InTable => 1, KeepValue => 1, &>
+<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj, AsTable => 1 &>
 
   </table>
   </&>

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