[Rt-commit] [svn] r1258 - in rt/branches/3.2-RELEASE: .
html/Elements html/Search sbin
jesse at pallas.eruditorum.org
jesse at pallas.eruditorum.org
Fri Jul 16 13:13:43 EDT 2004
Author: jesse
Date: Fri Jul 16 13:13:42 2004
New Revision: 1258
Modified:
rt/branches/3.2-RELEASE/ (props changed)
rt/branches/3.2-RELEASE/html/Elements/TicketList
rt/branches/3.2-RELEASE/html/Search/Build.html
rt/branches/3.2-RELEASE/html/Search/Results.html
rt/branches/3.2-RELEASE/sbin/license_tag
Log:
----------------------------------------------------------------------
r8222 at tinbook: jesse | 2004-07-16T17:09:30.264982Z
Web UI: Fixed bug which prevented unlimited searches
----------------------------------------------------------------------
Core: License tagger preliminary updates
Modified: rt/branches/3.2-RELEASE/html/Elements/TicketList
==============================================================================
--- rt/branches/3.2-RELEASE/html/Elements/TicketList (original)
+++ rt/branches/3.2-RELEASE/html/Elements/TicketList Fri Jul 16 13:13:42 2004
@@ -40,7 +40,7 @@
<& .Row, Format => \@Format, i => $i, record => $record, maxitems => $maxitems &>
% }
</TABLE>
-% if ($ShowNavigation) {
+% if ($Rows && $ShowNavigation) {
<hr>
<&|/l, $Page, int($TotalFound/$Rows)+1&>Page [_1] of [_2]</&>
@@ -76,7 +76,6 @@
# Scrub the html of the format string to remove any potential nasties.
$Format = $m->comp('/Elements/ScrubHTML', Content => $Format);
-$Rows ||= '25'; # we need a positive value
# {{{ item map
@@ -422,7 +421,7 @@
$Collection->OrderBy(FIELD => $OrderBy, ORDER => $Order);
-$Collection->RowsPerPage($Rows);
+$Collection->RowsPerPage($Rows) if ($Rows);
$Collection->GotoPage($Page-1); # SB uses page 0 as the first page
my $TotalFound = $Collection->CountAll();
@@ -433,7 +432,7 @@
</%INIT>
<%ARGS>
$Query => undef
-$Rows => 10
+$Rows => 50
$Page => 1
$Title => 'Ticket Search'
$Collection => undef
Modified: rt/branches/3.2-RELEASE/html/Search/Build.html
==============================================================================
--- rt/branches/3.2-RELEASE/html/Search/Build.html (original)
+++ rt/branches/3.2-RELEASE/html/Search/Build.html Fri Jul 16 13:13:42 2004
@@ -117,7 +117,7 @@
$SearchId ||= $search_hash->{'SearchId'} || 'new';
$Order ||= $search_hash->{'Order'} || 'ASC';
$OrderBy ||= $search_hash->{'OrderBy'} || 'id';
-$RowsPerPage ||= $search_hash->{'RowsPerPage'} || 50;
+$RowsPerPage = ($search_hash->{'RowsPerPage'} || 50) unless defined ($RowsPerPage);
$search ||= $search_hash->{'Object'};
# }}}
Modified: rt/branches/3.2-RELEASE/html/Search/Results.html
==============================================================================
--- rt/branches/3.2-RELEASE/html/Search/Results.html (original)
+++ rt/branches/3.2-RELEASE/html/Search/Results.html Fri Jul 16 13:13:42 2004
@@ -27,9 +27,9 @@
Title => $title,
Format => $Format,
Query => $Query,
- Rows => $ARGS{'Rows'},
- OrderBy => $ARGS{'OrderBy'},
- Order => $ARGS{'Order'} &>
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order &>
<hr>
<& /Elements/TicketList,
Query => $Query,
Modified: rt/branches/3.2-RELEASE/sbin/license_tag
==============================================================================
--- rt/branches/3.2-RELEASE/sbin/license_tag (original)
+++ rt/branches/3.2-RELEASE/sbin/license_tag Fri Jul 16 13:13:42 2004
@@ -1,9 +1,10 @@
#!/usr/bin/perl
-# BEGIN LICENSE BLOCK
+# BEGIN BPS TAGGED BLOCK
#
-# Copyright (c) 1996-2003 Jesse Vincent <jesse at bestpractical.com>
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC
+# <jesse at bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
#
@@ -23,14 +24,20 @@
# inclusion in the work.
#
#
-# END LICENSE BLOCK
+# END BPS TAGGED BLOCK
my $LICENSE = <<EOL;
-Copyright (c) 1996-2003 Jesse Vincent <jesse\@bestpractical.com>
+COPYRIGHT:
+
+This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC
+ <jesse at bestpractical.com>
(Except where explicitly superseded by other copyright notices)
+
+LICENSE:
+
This work is made available to you under the terms of Version 2 of
the GNU General Public License. A copy of that license should have
been provided with this software, but in any event can be snarfed
@@ -41,11 +48,27 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-Unless otherwise specified, all modifications, corrections or
-extensions to this work which alter its source code become the
-property of Best Practical Solutions, LLC when submitted for
-inclusion in the work.
-
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+CONTRIBUTION SUBMISSION POLICY:
+
+(The following paragraph is not intended to limit the rights granted
+to you to modify and distribute this software under the terms of
+the GNU General Public License and is only of importance to you if
+you choose to contribute your changes and enhancements to the
+community by submitting them to Best Practical Solutions, LLC.)
+
+By intentionally submitting any modifications, corrections or
+derivatives to this work, or any other work intended for use with
+Request Tracker, to Best Practical Solutions, LLC, you confirm that
+you are the copyright holder for those contributions and you grant
+Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+royalty-free, perpetual, license to use, copy, create derivative
+works based on those contributions, and sublicense and distribute
+those contributions and any derivatives thereof.
EOL
@@ -73,16 +96,16 @@
print "$pm - ";
- if ($file =~ /^%# BEGIN LICENSE BLOCK/ms) {
+ if ($file =~ /^%# BEGIN BPS TAGGED BLOCK/ms) {
print "has license section";
- $file =~ s/^%# BEGIN LICENSE BLOCK(.*?)%# END LICENSE BLOCK/%# BEGIN LICENSE BLOCK\n$pmlic%# END LICENSE BLOCK/ms;
+ $file =~ s/^%# BEGIN BPS TAGGED BLOCK(.*?)%# END BPS TAGGED BLOCK/%# BEGIN BPS TAGGED BLOCK\n$pmlic%# END BPS TAGGED BLOCK/ms;
} else {
print "no license section";
- $file ="%# BEGIN LICENSE BLOCK\n$pmlic%# END LICENSE BLOCK\n". $file;
+ $file ="%# BEGIN BPS TAGGED BLOCK\n$pmlic%# END BPS TAGGED BLOCK\n". $file;
}
- $file =~ s/%# END LICENSE BLOCK(\n+)/%# END LICENSE BLOCK\n/mg;
+ $file =~ s/%# END BPS TAGGED BLOCK(\n+)/%# END BPS TAGGED BLOCK\n/mg;
print "\n";
@@ -105,16 +128,16 @@
print "$pm - ";
- if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+ if ($file =~ /^# BEGIN BPS TAGGED BLOCK/ms) {
print "has license section";
- $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+ $file =~ s/^# BEGIN BPS TAGGED BLOCK(.*?)# END BPS TAGGED BLOCK/# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK/ms;
} else {
print "no license section";
- $file ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n". $file;
+ $file ="# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK\n". $file;
}
- $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n/mg;
+ $file =~ s/# END BPS TAGGED BLOCK(\n+)/# END BPS TAGGED BLOCK\n/mg;
print "\n";
@@ -138,16 +161,16 @@
print "$pm - ";
- if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+ if ($file =~ /^# BEGIN BPS TAGGED BLOCK/ms) {
print "has license section";
- $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+ $file =~ s/^# BEGIN BPS TAGGED BLOCK(.*?)# END BPS TAGGED BLOCK/# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK/ms;
} else {
print "no license section";
- $file ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n". $file;
+ $file ="# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK\n". $file;
}
- $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n/mg;
+ $file =~ s/# END BPS TAGGED BLOCK(\n+)/# END BPS TAGGED BLOCK\n/mg;
print "\n";
@@ -170,21 +193,21 @@
$pmlic =~ s/^/# /msg;
print "$pm - ";
- if ($file =~ /^# BEGIN LICENSE BLOCK/ms) {
+ if ($file =~ /^# BEGIN BPS TAGGED BLOCK/ms) {
print "has license section";
- $file =~ s/^# BEGIN LICENSE BLOCK(.*?)# END LICENSE BLOCK/# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK/ms;
+ $file =~ s/^# BEGIN BPS TAGGED BLOCK(.*?)# END BPS TAGGED BLOCK/# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK/ms;
} else {
print "no license section";
if ($file =~ /^(#!.*?)\n/) {
- my $lic ="# BEGIN LICENSE BLOCK\n$pmlic# END LICENSE BLOCK\n";
+ my $lic ="# BEGIN BPS TAGGED BLOCK\n$pmlic# END BPS TAGGED BLOCK\n";
$file =~ s/^(#!.*?)\n/$1\n$lic/;
}
}
- $file =~ s/# END LICENSE BLOCK(\n+)/# END LICENSE BLOCK\n\n/mg;
+ $file =~ s/# END BPS TAGGED BLOCK(\n+)/# END BPS TAGGED BLOCK\n\n/mg;
print "\n";
More information about the Rt-commit
mailing list