[Rt-commit] r4657 - in rt/branches/3.7-EXPERIMENTAL: html/Ticket html/Widgets/Form lib/RT lib/t/regression

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar  2 14:11:17 2006
New Revision: 4657

Modified:
   rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html
   rt/branches/3.7-EXPERIMENTAL/html/Widgets/Form/Boolean
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Date.pm
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/09-api-date.t

Log:
* return back changes that was backed out by wrong merge

Modified: rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Prefs/Other.html	Thu Mar  2 14:11:17 2006
@@ -33,7 +33,7 @@
 if ( $Update ) {
     foreach my $option( RT->Config->Options ) {
         my $meta = RT->Config->Meta( $option );
-        my $value = $m->comp('/Widgets/'. $meta->{'Widget'} .":Process",
+        my $value = $m->comp($meta->{'Widget'} .":Process",
             Arguments    => \%ARGS,
             Empty        => 1,
             %{ $meta->{'WidgetArguments'} },

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/ModifyLinks.html	Thu Mar  2 14:11:17 2006
@@ -54,7 +54,7 @@
 <form action="ModifyLinks.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->id%>" />
 <& /Elements/Callback, _CallbackName => 'FormStart', ARGSRef => \%ARGS &>
-
+<&| /Widgets/TitleBox, title => loc('Edit Links') &>
 <& /Elements/EditLinks, Object => $Ticket, Merge => 1 &>
 </&>
 <& /Elements/Submit, Label => loc('Save Changes') &>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Widgets/Form/Boolean
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Widgets/Form/Boolean	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Widgets/Form/Boolean	Thu Mar  2 14:11:17 2006
@@ -1,14 +1,15 @@
 <div id="form-box-<% lc $Name %>">
 <span class="description"><% $Description %></span>:
-<input type="checkbox" name="Boolean-<% $Name %>" <% $CurrentValue && 'checked' %>" />
+<input type="checkbox" name="Boolean-<% $Name %>" <% $value && 'checked' %>" />
 </div>
 <%INIT>
+my $value = defined $CurrentValue ? $CurrentValue : $EmptyValue;
 </%INIT>
 <%ARGS>
 $Name         => undef,
 $Description  => undef,
-
-$CurrentValue => 0,
+$EmptyValue   => 0,
+$CurrentValue => undef,
 </%ARGS>
 
 <%METHOD Process>

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Date.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Date.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Date.pm	Thu Mar  2 14:11:17 2006
@@ -655,12 +655,13 @@
     my $self = shift;
     my %args = ( Date => 1,
                  Time => 1,
-                 Timezone => 'GMT',
+                 Timezone => '',
                  Seconds => 1,
                  @_,
                );
        #  0    1    2     3     4    5     6     7      8      9
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydaym,$isdst,$offset) = $self->Localtime($args{'Timezone'});
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydaym,$isdst,$offset) =
+                            $self->Localtime($args{'Timezone'});
 
     #the month needs incrementing, as gmtime returns 0-11
     $mon++;
@@ -800,17 +801,9 @@
     my $self = shift;
     my $context = lc(shift);
 
-
-
-
-
-
-
-
-    $context = 'utc' unless $context =~ /^(?:utc|server|user)$/;
+    $context = 'utc' unless $context =~ /^(?:utc|server|user)$/i;
 
     my $tz;
-
     if( $context eq 'user' ) {
         $tz = $self->CurrentUser->UserObj->Timezone;
     } elsif( $context eq 'server') {

Modified: rt/branches/3.7-EXPERIMENTAL/lib/t/regression/09-api-date.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/t/regression/09-api-date.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/t/regression/09-api-date.t	Thu Mar  2 14:11:17 2006
@@ -81,7 +81,7 @@
 {
     my $date = RT::Date->new($RT::SystemUser);
     is($date->Unix, 0, "new date returns 0 in Unix format");
-    is($date->Get, '1970-01-01 00:00:00', "default is ISO format"); 
+    is($date->Get, '1970-01-01 00:00:00', "default is ISO format");
     is($date->Get(Format =>'SomeBadFormat'),
        '1970-01-01 00:00:00',
        "don't know format, return ISO format");