[freeside-commits] freeside/rt/share/html/Elements CollectionList, 1.2, 1.2.4.1 ColumnMap, 1.4, 1.4.2.1 Dashboards, 1.3, 1.3.2.1 Footer, 1.2, 1.2.4.1 Header, 1.5, 1.5.2.1 PageLayout, 1.3, 1.3.4.1 RefreshHomepage, 1.3, 1.3.2.1 SelectDate, 1.3, 1.3.4.1 SelectQueue, 1.1.1.2.4.1, 1.1.1.2.4.2 ShowUserVerbose, 1.2, 1.2.4.1 TicketList, 1.4, 1.4.4.1
Ivan,,,
ivan at wavetail.420.am
Fri Apr 8 16:13:53 PDT 2011
Update of /home/cvs/cvsroot/freeside/rt/share/html/Elements
In directory wavetail.420.am:/tmp/cvs-serv23950/share/html/Elements
Modified Files:
Tag: FREESIDE_2_1_BRANCH
CollectionList ColumnMap Dashboards Footer Header PageLayout
RefreshHomepage SelectDate SelectQueue ShowUserVerbose
TicketList
Log Message:
landing 3.8.9 on 2.1 branch for 2.1.3
Index: PageLayout
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/PageLayout,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -w -d -r1.3 -r1.3.4.1
--- PageLayout 20 Mar 2010 22:11:37 -0000 1.3
+++ PageLayout 8 Apr 2011 23:13:51 -0000 1.3.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
@@ -189,6 +189,8 @@
my ($menu_depth, $almost_last, $page_tabs);
+# don't pull out the last submenu for 3.5-compat theme
+# see #14853 for details.
if (RT->Config->Get( 'WebDefaultStylesheet', $session{'CurrentUser'} ) ne '3.4-compat') {
($menu_depth, $almost_last) = @{ $m->comp('.menu_recurse', data => $toptabs, current => $current_toptab ) };
Index: CollectionList
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/CollectionList,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- CollectionList 20 May 2010 09:53:42 -0000 1.2
+++ CollectionList 8 Apr 2011 23:13:51 -0000 1.2.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
@@ -54,6 +54,16 @@
my $TotalFound = $Collection->CountAll();
return '' if !$TotalFound && !$ShowEmpty;
+if ( $Rows ) {
+ if ( $TotalFound <= $Rows ) {
+ $Page = 1;
+ }
+ else {
+ my $MaxPage = int( $TotalFound / $Rows ) + ( $TotalFound % $Rows ? 1 : 0 );
+ $Page = $MaxPage if $Page > $MaxPage;
+ }
+}
+
# XXX: ->{'order_by'} is hacky, but there is no way to check if
# collection is ordered or not
if ( @OrderBy && ($AllowSorting || !$Collection->{'order_by'}) ) {
Index: ColumnMap
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/ColumnMap,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -w -d -r1.4 -r1.4.2.1
--- ColumnMap 15 Aug 2010 00:44:54 -0000 1.4
+++ ColumnMap 8 Apr 2011 23:13:51 -0000 1.4.2.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: Footer
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/Footer,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- Footer 20 Mar 2010 22:11:37 -0000 1.2
+++ Footer 8 Apr 2011 23:13:51 -0000 1.2.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: Dashboards
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/Dashboards,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -w -d -r1.3 -r1.3.2.1
--- Dashboards 18 Aug 2010 00:14:10 -0000 1.3
+++ Dashboards 8 Apr 2011 23:13:51 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: RefreshHomepage
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/RefreshHomepage,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -w -d -r1.3 -r1.3.2.1
--- RefreshHomepage 15 Aug 2010 00:44:54 -0000 1.3
+++ RefreshHomepage 8 Apr 2011 23:13:51 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: Header
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/Header,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -w -d -r1.5 -r1.5.2.1
--- Header 26 Aug 2010 06:13:21 -0000 1.5
+++ Header 8 Apr 2011 23:13:51 -0000 1.5.2.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: ShowUserVerbose
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/ShowUserVerbose,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -w -d -r1.2 -r1.2.4.1
--- ShowUserVerbose 30 Jun 2010 17:48:23 -0000 1.2
+++ ShowUserVerbose 8 Apr 2011 23:13:51 -0000 1.2.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
@@ -63,7 +63,7 @@
$Address = Email::Address->new( $phrase, $address, $comment );
}
-$Address->comment('') if $comment && lc $Address->user eq lc $comment;
+$Address->comment('') if $comment and defined $Address->user and lc $Address->user eq lc $comment;
if ( $phrase and my ( $l, $r ) = ( $phrase =~ /^(\w+) (\w+)$/ ) ) {
$Address->phrase('')
if $Address->user =~ /^\Q$l\E.\Q$r\E$/
Index: TicketList
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/TicketList,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -w -d -r1.4 -r1.4.4.1
--- TicketList 20 May 2010 10:13:31 -0000 1.4
+++ TicketList 8 Apr 2011 23:13:51 -0000 1.4.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: SelectQueue
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/SelectQueue,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.2
diff -u -w -d -r1.1.1.2.4.1 -r1.1.1.2.4.2
--- SelectQueue 1 Jan 2011 00:47:17 -0000 1.1.1.2.4.1
+++ SelectQueue 8 Apr 2011 23:13:51 -0000 1.1.1.2.4.2
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
Index: SelectDate
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/SelectDate,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -w -d -r1.3 -r1.3.4.1
--- SelectDate 21 Jul 2010 02:06:44 -0000 1.3
+++ SelectDate 8 Apr 2011 23:13:51 -0000 1.3.4.1
@@ -2,8 +2,8 @@
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%#
More information about the freeside-commits
mailing list