Bug 104677 : Votes field (text style) on showvotes.cgi defaults to size 5, not natural size and doesn't include a maxlength attribute.

Patch by Christoper Aillon <caillon@returnzero.com>.
This commit is contained in:
matty%chariot.net.au 2001-11-17 10:29:55 +00:00
parent a6094c4e6f
commit 8cd4f2a450
2 changed files with 25 additions and 6 deletions

View File

@ -21,6 +21,7 @@
# Dan Mosedale <dmose@mozilla.org>
# Jake <jake@acutex.net>
# Bradley Baetz <bbaetz@cs.mcgill.ca>
# Christopher Aillon <christopher@aillon.com>
# Contains some global variables and routines used throughout bugzilla.
@ -1502,6 +1503,22 @@ sub PerformSubsts {
return $str;
}
# Min and max routines.
sub min {
my $min = shift(@_);
foreach my $val (@_) {
$min = $val if $val < $min;
}
return $min;
}
sub max {
my $max = shift(@_);
foreach my $val (@_) {
$max = $val if $val > $max;
}
return $max;
}
# Trim whitespace from front and back.

View File

@ -20,6 +20,7 @@
#
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Stephan Niemz <st.n@gmx.net>
# Christopher Aillon <christopher@aillon.com>
use diagnostics;
use strict;
@ -138,13 +139,14 @@ if (defined $::FORM{'bug_id'}) {
$summary = html_quote($summary);
$sum += $count;
if ($canedit) {
my $min = $maxvotesperbug{$product}; # minimum of these two
$min = $::prodmaxvotes{$product} if $::prodmaxvotes{$product} < $min;
if( $min < 2 ) { # checkbox
my $checked = $count ? ' checked' : '';
my $min = min($::prodmaxvotes{$product}, $maxvotesperbug{$product});
if ($min < 2) { # checkbox
my $checked = $count ? ' checked="checked"' : '';
$count = qq{<input type="checkbox" name="$id" value="1"$checked>};
}else { # normal input
$count = qq{<input name="$id" value="$count" size="5">};
}
else { # text input
my $maxlength = length $min;
$count = qq{<input name="$id" value="$count" size="$maxlength" maxlength="$maxlength">};
}
}
print qq{