[Rt-commit] r13735 - in rt/3.8/trunk: . share/html

[ruz at bestpractical.com]

Author: ruz
Date: Wed Jul  2 17:41:09 2008
New Revision: 13735

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Elements/EditCustomField
   rt/3.8/trunk/share/html/Elements/EditCustomFieldSelect
   rt/3.8/trunk/share/html/autohandler

Log:
* merge 3.7-RTIR-RELENG -> 3.8-trunk

 r13629 at cubic-pc (orig r13585):  ruz | 2008-06-25 05:41:58 +0400
 * fetch everything except LargeContent
 r13636 at cubic-pc (orig r13592):  ruz | 2008-06-26 01:56:01 +0400
 * DBIx::SB use Time::HiRes so it's really better to log precise timings
 r13672 at cubic-pc (orig r13628):  ruz | 2008-06-27 02:39:25 +0400
 * HasEntry call is too slow, refactor it away.
   Improves page rendering from hundreds of seconds to several.


Modified: rt/3.8/trunk/share/html/Elements/EditCustomField
==============================================================================
--- rt/3.8/trunk/share/html/Elements/EditCustomField	(original)
+++ rt/3.8/trunk/share/html/Elements/EditCustomField	Wed Jul  2 17:41:09 2008
@@ -57,7 +57,7 @@
 my $Values;
 if ( $Object && $Object->id ) {
     $Values = $Object->CustomFieldValues( $CustomField->id );
-    $Values->Columns( qw( id CustomField ObjectType ObjectId Disabled Content ContentType ContentEncoding ) );
+    $Values->Columns( qw( id CustomField ObjectType ObjectId Disabled Content ContentType ContentEncoding SortOrder Creator Created LastUpdatedBy LastUpdated ) );
     $NamePrefix ||= join('-', 'Object', ref($Object), $Object->Id, 'CustomField', '');
 } elsif (not $Default) {
     my %TOP = $m->request_args;

Modified: rt/3.8/trunk/share/html/Elements/EditCustomFieldSelect
==============================================================================
--- rt/3.8/trunk/share/html/Elements/EditCustomFieldSelect	(original)
+++ rt/3.8/trunk/share/html/Elements/EditCustomFieldSelect	Wed Jul  2 17:41:09 2008
@@ -83,6 +83,11 @@
 
 <%METHOD options>
 % @Default = grep defined && length, @Default;
+% # $Values->HasEntry is too slow here
+% if ( !@Default && $Values ) {
+%     @Default = map $_->Content, @{$Values->ItemsArrayRef};
+% }
+% $_ = lc $_ foreach @Default;
 % my $selected;
 % my $CFVs = $CustomField->Values;
 % my @levels;
@@ -107,8 +112,7 @@
 %           push @levels, $level;
 %       }
         <option value="<% $name %>"
-%       if ( ( grep $_ eq $name, @Default )
-%            || ( $Values && $Values->HasEntry( $name ) ) )
+%       if ( grep $_ eq lc $name, @Default )
 %       {
 %           $$SelectedRef = 1;
             selected="selected"

Modified: rt/3.8/trunk/share/html/autohandler
==============================================================================
--- rt/3.8/trunk/share/html/autohandler	(original)
+++ rt/3.8/trunk/share/html/autohandler	Wed Jul  2 17:41:09 2008
@@ -324,7 +324,7 @@
         }
         $RT::Logger->log(
             level => $log_sql_statements,
-            message => "SQL(" . sprintf( "%.2f", $duration ) . "s): $sql;"
+            message => "SQL(" . sprintf( "%.6f", $duration ) . "s): $sql;"
                 . ( @bind ? "  [ bound values: @{[map{qq|'$_'|} @bind]} ]" : "" )
         );
     }