Commit ed751860 authored by Max Kanat-Alexander's avatar Max Kanat-Alexander

Bug 329637: Add a Calendar widget to the Deadline field

r=ghendricks, a=mkanat
parent 738591be
...@@ -218,8 +218,7 @@ use constant NUMERIC_COLUMNS => qw( ...@@ -218,8 +218,7 @@ use constant NUMERIC_COLUMNS => qw(
); );
sub DATE_COLUMNS { sub DATE_COLUMNS {
my @fields = Bugzilla->get_fields( my @fields = Bugzilla->get_fields({ type => FIELD_TYPE_DATETIME });
{ custom => 1, type => FIELD_TYPE_DATETIME });
return map { $_->name } @fields; return map { $_->name } @fields;
} }
......
...@@ -219,7 +219,7 @@ use constant DEFAULT_FIELDS => ( ...@@ -219,7 +219,7 @@ use constant DEFAULT_FIELDS => (
in_new_bugmail => 1, buglist => 1}, in_new_bugmail => 1, buglist => 1},
{name => 'remaining_time', desc => 'Remaining Hours', buglist => 1}, {name => 'remaining_time', desc => 'Remaining Hours', buglist => 1},
{name => 'deadline', desc => 'Deadline', {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 => 'commenter', desc => 'Commenter'},
{name => 'flagtypes.name', desc => 'Flags', buglist => 1}, {name => 'flagtypes.name', desc => 'Flags', buglist => 1},
{name => 'requestees.login_name', desc => 'Flag Requestee'}, {name => 'requestees.login_name', desc => 'Flag Requestee'},
......
...@@ -98,6 +98,9 @@ table#flags { ...@@ -98,6 +98,9 @@ table#flags {
.bz_time_tracking_table .bz_summarize_time { .bz_time_tracking_table .bz_summarize_time {
text-align: right; text-align: right;
} }
.bz_time_tracking_table #deadline {
width: 7em;
}
#summary tr td { #summary tr td {
vertical-align:top; vertical-align:top;
......
...@@ -445,11 +445,9 @@ TUI_hide_default('expert_fields'); ...@@ -445,11 +445,9 @@ TUI_hide_default('expert_fields');
</td> </td>
</tr> </tr>
<tr> <tr>
<th>Deadline:</th> [% INCLUDE bug/field.html.tmpl
<td colspan="2"> bug = default, field = bug_fields.deadline, value = deadline,
<input name="deadline" size="10" maxlength="10" value="[% deadline FILTER html %]"> editable = 1, value_span = 2 %]
<small>(YYYY-MM-DD)</small>
</td>
</tr> </tr>
<tr> <tr>
......
...@@ -999,9 +999,9 @@ ...@@ -999,9 +999,9 @@
[% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %] [% PROCESS formattimeunit time_unit=bug.estimated_time - (bug.actual_time + bug.remaining_time) %]
</td> </td>
<td> <td>
<input name="deadline" id="deadline" value="[% bug.deadline %]" [% INCLUDE bug/field.html.tmpl
size="10" maxlength="10"><br /> field = bug_fields.deadline, value = bug.deadline, no_tds = 1
<small>(YYYY-MM-DD)</small> editable = bug.check_can_change_field('deadline', 0, 1) %]
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -149,13 +149,9 @@ ...@@ -149,13 +149,9 @@
value="[% dontchange FILTER html %]" value="[% dontchange FILTER html %]"
size="6"> size="6">
</td> </td>
<th><label for="deadline">Deadline (YYYY-MM-DD):</label></th> [% PROCESS bug/field.html.tmpl
<td> field = bug_fields.deadline, value = dontchange
<input id="deadline" editable = 1, allow_dont_change = 1 %]
name="deadline"
value="[% dontchange FILTER html %]"
size="10">
</td>
</tr> </tr>
<tr> <tr>
<th><label for="remaining_time">Remaining Hours:</label></th> <th><label for="remaining_time">Remaining Hours:</label></th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment