summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Bug.pm3
-rw-r--r--Bugzilla/Field.pm2
-rw-r--r--skins/standard/show_bug.css3
-rw-r--r--template/en/default/bug/create/create.html.tmpl8
-rw-r--r--template/en/default/bug/edit.html.tmpl6
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl10
6 files changed, 14 insertions, 18 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index b3f0fe58e..ad272af22 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -218,8 +218,7 @@ use constant NUMERIC_COLUMNS => qw(
);
sub DATE_COLUMNS {
- my @fields = Bugzilla->get_fields(
- { custom => 1, type => FIELD_TYPE_DATETIME });
+ my @fields = Bugzilla->get_fields({ type => FIELD_TYPE_DATETIME });
return map { $_->name } @fields;
}
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 6b9ceb7c0..c32a6a213 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -219,7 +219,7 @@ use constant DEFAULT_FIELDS => (
in_new_bugmail => 1, buglist => 1},
{name => 'remaining_time', desc => 'Remaining Hours', buglist => 1},
{name => 'deadline', desc => 'Deadline',
- in_new_bugmail => 1, buglist => 1},
+ type => FIELD_TYPE_DATETIME, in_new_bugmail => 1, buglist => 1},
{name => 'commenter', desc => 'Commenter'},
{name => 'flagtypes.name', desc => 'Flags', buglist => 1},
{name => 'requestees.login_name', desc => 'Flag Requestee'},
diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index ec981d51c..1768ddc42 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -98,6 +98,9 @@ table#flags {
.bz_time_tracking_table .bz_summarize_time {
text-align: right;
}
+.bz_time_tracking_table #deadline {
+ width: 7em;
+}
#summary tr td {
vertical-align:top;
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 1f3380a29..dce1da762 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -445,11 +445,9 @@ TUI_hide_default('expert_fields');
</td>
</tr>
<tr>
- <th>Deadline:</th>
- <td colspan="2">
- <input name="deadline" size="10" maxlength="10" value="[% deadline FILTER html %]">
- <small>(YYYY-MM-DD)</small>
- </td>
+ [% INCLUDE bug/field.html.tmpl
+ bug = default, field = bug_fields.deadline, value = deadline,
+ editable = 1, value_span = 2 %]
</tr>
<tr>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9979e9551..9725134cf 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -999,9 +999,9 @@
[% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %]
</td>
<td>
- <input name="deadline" id="deadline" value="[% bug.deadline %]"
- size="10" maxlength="10"><br />
- <small>(YYYY-MM-DD)</small>
+ [% INCLUDE bug/field.html.tmpl
+ field = bug_fields.deadline, value = bug.deadline, no_tds = 1
+ editable = bug.check_can_change_field('deadline', 0, 1) %]
</td>
</tr>
<tr>
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 91c86cc64..5f16dae69 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -149,13 +149,9 @@
value="[% dontchange FILTER html %]"
size="6">
</td>
- <th><label for="deadline">Deadline (YYYY-MM-DD):</label></th>
- <td>
- <input id="deadline"
- name="deadline"
- value="[% dontchange FILTER html %]"
- size="10">
- </td>
+ [% PROCESS bug/field.html.tmpl
+ field = bug_fields.deadline, value = dontchange
+ editable = 1, allow_dont_change = 1 %]
</tr>
<tr>
<th><label for="remaining_time">Remaining Hours:</label></th>