[Rt-commit] r4388 - in rt/branches/3.5-TESTING: html/Elements html/Elements/CollectionAsTable html/Search html/Search/Elements html/Ticket html/Ticket/Elements html/Tools html/Widgets lib/RT/Interface/Web lib/RT/Interface/Web/Menu

kevinr at bestpractical.com kevinr at bestpractical.com
Fri Jan 13 02:40:58 EST 2006 

Author: kevinr
Date: Fri Jan 13 02:40:52 2006
New Revision: 4388

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/CollectionAsTable/Header
   rt/branches/3.5-TESTING/html/Elements/Menu
   rt/branches/3.5-TESTING/html/Elements/MessageBox
   rt/branches/3.5-TESTING/html/Elements/SelectDate
   rt/branches/3.5-TESTING/html/Elements/SelectWatcherType
   rt/branches/3.5-TESTING/html/Elements/TicketList
   rt/branches/3.5-TESTING/html/Search/Bulk.html
   rt/branches/3.5-TESTING/html/Search/Elements/BuildFormatString
   rt/branches/3.5-TESTING/html/Search/Elements/EditSearches
   rt/branches/3.5-TESTING/html/Ticket/Elements/AddWatchers
   rt/branches/3.5-TESTING/html/Ticket/ModifyAll.html
   rt/branches/3.5-TESTING/html/Tools/Offline.html
   rt/branches/3.5-TESTING/html/Widgets/TitleBox
   rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu.pm
   rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu/Item.pm

Log:
 r10349 at SAD-GIRL-IN-SNOW:  kevinr | 2006-01-13 02:15:36 -0500
 RT-Ticket: 7150, 7151, 7152, 7153, 7155, 7156, 7157, 7158, 7159, 7160, 7161, 7162, 7164, 7165, 7166
 RT-Status: resolved
 RT-Action: correspond
 
 Fixed Mason warnings in:
   Elements/CollectionAsTable/Header
   Elements/Menu
   Elements/MessageBox
   Elements/SelectDate
   Elements/SelectWatcherType
   Elements/TicketList
   Search/Bulk.html
   Search/Elements/BuildFormatString
   Search/Elements/EditSearches
   Ticket/Elements/AddWatchers
   Ticket/Elements/ShowTransactionAttachments
   Ticket/ModifyAll.html
   Ticket/Reminders.html
   Tools/Offline.html
   Widgets/TitleBox
 (thanks to Jim Meyer)


Modified: rt/branches/3.5-TESTING/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/CollectionAsTable/Header	(original)
+++ rt/branches/3.5-TESTING/html/Elements/CollectionAsTable/Header	Fri Jan 13 02:40:52 2006
@@ -62,7 +62,7 @@
 my $item = 0;
 foreach my $col (@Format) {
     $item++;
-    if ( $col->{title} eq 'NEWLINE' ) {
+    if ( $col->{title} && ($col->{title} eq 'NEWLINE') ) {
         while ( $item < $maxitems ) {
             $m->out(qq{<th class="collection-as-table">&nbsp;</th>\n});
             $item++;
@@ -73,7 +73,7 @@
     }
     else {
         $m->out('<th class="collection-as-table">');
-        my $title = $col->{title};
+        my $title = $col->{title} || '';
         $title =~ s/^__(.*)__$/$1/o;
         $title = (
             $m->comp(

Modified: rt/branches/3.5-TESTING/html/Elements/Menu
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Menu	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Menu	Fri Jan 13 02:40:52 2006
@@ -84,7 +84,12 @@
 %
 %     $class->{li} = join ' ', @li;
 %     
-  <li<% $class->{li} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && qq[<span class="bullet">&#183; </span>]|n%><a href="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'}%>"<% $class->{a} && qq[ class="$class->{a}"] |n%><% !$level && " accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></a>
+  <li<% $class->{li} ? qq[ class="$class->{li}"] : ''|n %>>
+    <% $count > 1 && !$postsep && qq[<span class="bullet">&#183; </span>]|n%>
+    <a href="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'} || '' %>"
+    <% $class->{a} && qq[ class="$class->{a}"] |n%>
+    <% !$level && " accesskey='".$accesskey++."'" |n%>>
+    <% $toptabs->{$tab}->{'title'} || ''%></a>
 %# Second-level items
 %     if ($toptabs->{$tab}->{'subtabs'}
 %         and keys %{$toptabs->{$tab}->{'subtabs'}})

Modified: rt/branches/3.5-TESTING/html/Elements/MessageBox
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/MessageBox	(original)
+++ rt/branches/3.5-TESTING/html/Elements/MessageBox	Fri Jan 13 02:40:52 2006
@@ -46,7 +46,7 @@
 <textarea class="messagebox" cols="<%$Width%>" rows="<%$Height%>" wrap="<%$Wrap%>" name="<%$Name%>"><& /Elements/Callback, %ARGS &><% $Default %><%$message%><%$IncludeSignature ? $signature : ''%></textarea>
 <%INIT>
 
-my ($message);
+my $message = '';
 
 if ($QuoteTransaction) {
     my $transaction=RT::Transaction->new($session{'CurrentUser'});

Modified: rt/branches/3.5-TESTING/html/Elements/SelectDate
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/SelectDate	(original)
+++ rt/branches/3.5-TESTING/html/Elements/SelectDate	Fri Jan 13 02:40:52 2006
@@ -67,7 +67,7 @@
 $ShowTime => undef
 $menu_prefix=>''
 $current=>time
-$Default => undef
+$Default => ''
 $Name => undef
 $Size => 16
 </%args>

Modified: rt/branches/3.5-TESTING/html/Elements/SelectWatcherType
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/SelectWatcherType	(original)
+++ rt/branches/3.5-TESTING/html/Elements/SelectWatcherType	Fri Jan 13 02:40:52 2006
@@ -48,7 +48,7 @@
 <option value="">-</option>
 % }
 %for my $option (@types) {
-<option value="<%$option%>" <%$option eq $Default && "SELECTED"%>><%loc($option)%></option>
+<option value="<%$option%>" <%defined($Default) && $option eq $Default && "SELECTED"%>><%loc($option)%></option>
 %}
 </select>
 

Modified: rt/branches/3.5-TESTING/html/Elements/TicketList
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/TicketList	(original)
+++ rt/branches/3.5-TESTING/html/Elements/TicketList	Fri Jan 13 02:40:52 2006
@@ -132,7 +132,7 @@
 my $item = 0;
 foreach my $col (@Format) {
     $item++;
-    if ( $col->{title} eq 'NEWLINE' ) {
+    if ( $col->{title} && ($col->{title} eq 'NEWLINE') ) {
         $item = 0;
     }
     else {

Modified: rt/branches/3.5-TESTING/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Bulk.html	(original)
+++ rt/branches/3.5-TESTING/html/Search/Bulk.html	Fri Jan 13 02:40:52 2006
@@ -236,15 +236,15 @@
 my $do_comment_reply = 0;
 
 # Prepare for ticket updates
-$ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
-chomp( $ARGS{'UpdateContent'} );
-
-if (   $ARGS{'UpdateContent'}
-    && $ARGS{'UpdateContent'} ne ''
-    && $ARGS{'UpdateContent'} ne "-- \n"
-    . $session{'CurrentUser'}->UserObj->Signature )
-{
-    $do_comment_reply = 1;
+if ($ARGS{'UpdateContent'}) {
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+    chomp( $ARGS{'UpdateContent'} );
+
+    if ($ARGS{'UpdateContent'} ne ''
+        && $ARGS{'UpdateContent'} ne "-- \n"
+        . $session{'CurrentUser'}->UserObj->Signature ) {
+        $do_comment_reply = 1;
+    }
 }
 
 #Iterate through each ticket we've been handed

Modified: rt/branches/3.5-TESTING/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Elements/BuildFormatString	(original)
+++ rt/branches/3.5-TESTING/html/Search/Elements/BuildFormatString	Fri Jan 13 02:40:52 2006
@@ -223,11 +223,13 @@
 my @format_string;
 foreach my $field (@seen) {
     next unless $field;
-    my $row = "'" . $field->{Prefix};
+    my $row = "'";
+    $row .= $field->{Prefix} if $field->{Prefix};
     $row .= "__" . ($field->{Column} =~ m/\(/ ? $field->{Column} # func, don't escape
 		    : $m->interp->apply_escapes( $field->{Column}, 'h' )) . "__"
       unless ( $field->{Column} eq "<blank>" );
-    $row .= $field->{Suffix} . "'";
+    $row .= $field->{Suffix} if $field->{Suffix};
+    $row .= "'";
     push( @format_string, $row );
 }
 

Modified: rt/branches/3.5-TESTING/html/Search/Elements/EditSearches
==============================================================================

Modified: rt/branches/3.5-TESTING/html/Ticket/Elements/AddWatchers
==============================================================================

Modified: rt/branches/3.5-TESTING/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Ticket/ModifyAll.html	(original)
+++ rt/branches/3.5-TESTING/html/Ticket/ModifyAll.html	Fri Jan 13 02:40:52 2006
@@ -169,7 +169,7 @@
 	$ARGS{'UpdateAttachments'}->{ $subject } = $attachment;
     }
 
-    $ARGS{'UpdateContent'} =~ s/\r+\n/\n/g;
+    $ARGS{'UpdateContent'} =~ s/\r+\n/\n/g if $ARGS{'UpdateContent'};
 
     if ($ARGS{'UpdateAttachments'} || ( $ARGS{'UpdateContent'} && $ARGS{'UpdateContent'} ne  "-- \n" . 
 				$session{'CurrentUser'}->UserObj->Signature)) {

Modified: rt/branches/3.5-TESTING/html/Tools/Offline.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Tools/Offline.html	(original)
+++ rt/branches/3.5-TESTING/html/Tools/Offline.html	Fri Jan 13 02:40:52 2006
@@ -96,7 +96,7 @@
 
 </form>
 <%args>
-$requestoraddress => undef
+$requestoraddress => ''
 $qname => undef
 $string => undef
 </%args>

Modified: rt/branches/3.5-TESTING/html/Widgets/TitleBox
==============================================================================
--- rt/branches/3.5-TESTING/html/Widgets/TitleBox	(original)
+++ rt/branches/3.5-TESTING/html/Widgets/TitleBox	Fri Jan 13 02:40:52 2006
@@ -47,6 +47,6 @@
   <& TitleBoxStart, %ARGS &><% $m->content | n %><& TitleBoxEnd &>
 </div>
 <%ARGS>
-$class => undef
+$class => ''
 </%ARGS>
 

Modified: rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu.pm
==============================================================================
--- rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu.pm	(original)
+++ rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu.pm	Fri Jan 13 02:40:52 2006
@@ -17,3 +17,5 @@
     my $self = shift;
     return $self->{'root_node'};
 }
+
+1;

Modified: rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu/Item.pm
==============================================================================
--- rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu/Item.pm	(original)
+++ rt/branches/3.5-TESTING/lib/RT/Interface/Web/Menu/Item.pm	Fri Jan 13 02:40:52 2006
@@ -36,3 +36,4 @@
     return $self->{'_attributes'}->{$key};
 }
 
+1;

More information about the Rt-commit mailing list