[interchange-cvs] interchange - racke modified lib/Vend/Form.pm
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Nov 30 10:07:16 EST 2005
User: racke
Date: 2005-11-30 15:07:15 GMT
Modified: lib/Vend Form.pm
Log:
merged changes 2.64 vs 2.64.2.1
+++ 2.64.2.1 +++
don't use current time as default for date_blank
Revision Changes Path
2.65 +6 -6 interchange/lib/Vend/Form.pm
rev 2.65, prev_rev 2.64
Index: Form.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Form.pm,v
retrieving revision 2.64
retrieving revision 2.65
diff -u -r2.64 -r2.65
--- Form.pm 8 Nov 2005 18:14:45 -0000 2.64
+++ Form.pm 30 Nov 2005 15:07:15 -0000 2.65
@@ -1,6 +1,6 @@
# Vend::Form - Generate Form widgets
#
-# $Id: Form.pm,v 2.64 2005/11/08 18:14:45 jon Exp $
+# $Id: Form.pm,v 2.65 2005/11/30 15:07:15 racke Exp $
#
# Copyright (C) 2002-2005 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -39,7 +39,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.64 $, 10);
+$VERSION = substr(q$Revision: 2.65 $, 10);
@EXPORT = qw (
display
@@ -462,15 +462,15 @@
}
my @t = localtime($now || time);
- if (not $val) {
- $t[2]++ if $t[2] < 23;
- $val = POSIX::strftime("%Y%m%d%H00", @t);
- }
my $sel = 0;
my $out = qq{<select name="$name"$sel_extra>};
my $o;
if ($opt->{blank}) {
$out .= qq{<option value="0"$opt_extra>------</option>};
+ } elsif (not $val) {
+ # use current time with possible adjustments as default value
+ $t[2]++ if $t[2] < 23;
+ $val = POSIX::strftime("%Y%m%d%H00", @t);
}
for(@Months) {
$o = qq{<option value="$_->[0]"$opt_extra>} . errmsg($_->[1]) . '</option>';
More information about the interchange-cvs
mailing list