Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 405898: Date/Time Fields should accept times like H:MM

Browse Source 
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@242133 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2007-12-27 22:39:28 +00:00
parent f5f620953a
commit 8c686c07fa
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/webtools/bugzilla/Bugzilla/Util.pm
View File

@@ -476,8 +476,8 @@ sub validate_time {
my $ts = str2time($time);
if ($ts) {
$time2 = time2str("%H:%M:%S", $ts);
if (trim($time) =~ /^\d\d:\d\d$/) {
$time .= ':00';
if ($time =~ /^(\d{1,2}):(\d\d)(?::(\d\d))?$/) {
$time = sprintf("%02d:%02d:%02d", $1, $2, $3 || 0);
}
}
my $ret = ($ts && $time eq $time2);

7
mozilla/webtools/bugzilla/js/field.js
View File

@@ -85,7 +85,7 @@ function setFieldFromCalendar(type, args, date_field) {
// We can't just write the date straight into the field, because there
// might already be a time there.
var timeRe = /(\d\d):(\d\d)(?::(\d\d))?/;
var timeRe = /\b(\d{1,2}):(\d\d)(?::(\d\d))?/;
var currentTime = timeRe.exec(date_field.value);
var d = new Date(setDate[0], setDate[1] - 1, setDate[2]);
if (currentTime) {
@@ -104,9 +104,6 @@ function setFieldFromCalendar(type, args, date_field) {
var dateStr = year + '-' + month + '-' + day;
if (currentTime) {
var hours = d.getHours();
if (hours < 10) hours = '0' + String(hours);
d.setHours(hours);
var minutes = d.getMinutes();
if (minutes < 10) minutes = '0' + String(minutes);
var seconds = d.getSeconds();
@@ -114,7 +111,7 @@ function setFieldFromCalendar(type, args, date_field) {
seconds = '0' + String(seconds);
}
dateStr = dateStr + ' ' + hours + ':' + minutes;
dateStr = dateStr + ' ' + d.getHours() + ':' + minutes;
if (seconds) dateStr = dateStr + ':' + seconds;
}