Remove also percentage_complete and days_elapsed from fielddefs

Bugzilla/Field.pm

@@ -199,7 +199,6 @@ use constant DEFAULT_FIELDS => (map { my $i = 0; $_ = { (map { (DEFAULT_FIELD_CO
     [ 'deadline',              'Deadline',              0, 1, 1, FIELD_TYPE_DATETIME ],
     [ 'flagtypes.name',        'Flags and Requests',    0, 0, 0 ],
     [ 'work_time',             'Hours Worked',          0, 0, 0 ],
-    [ 'percentage_complete',   'Percentage Complete',   0, 0, 0 ],
     [ 'content',               'Content',               0, 0, 0 ],
     [ 'see_also',              'See Also',              0, 1, 0, FIELD_TYPE_BUG_URLS ],
 ));
@@ -1172,17 +1171,6 @@ sub populate_field_definitions
         }
     }
 
-    # DELETE fields which were added only accidentally, or which
-    # were never tracked in bugs_activity. Note that you should not
-    # delete fields which are used by bugs_activity.
-
-    $dbh->do(
-        "DELETE FROM fielddefs WHERE name IN ('cc_accessible', 'requesters.login_name',
-        'attachments.thedata', 'attach_data.thedata', 'content', 'requestees.login_name',
-        'setters.login_name', 'longdescs.isprivate', 'assignee_accessible', 'qacontact_accessible',
-        'commenter', 'owner_idle_time', 'attachments.submitter')"
-    );
-
     # MODIFY old field definitions
 
     # 2005-11-13 LpSolit@gmail.com - Bug 302599
@@ -1253,6 +1241,17 @@ sub populate_field_definitions
             description => $field_description
         });
     }
+
+    # DELETE fields which were added only accidentally, or which
+    # were never tracked in bugs_activity. Note that you should not
+    # delete fields which are used by bugs_activity.
+
+    $dbh->do(
+        "DELETE FROM fielddefs WHERE name IN ('cc_accessible', 'requesters.login_name',
+        'attachments.thedata', 'attach_data.thedata', 'content', 'requestees.login_name',
+        'setters.login_name', 'longdescs.isprivate', 'assignee_accessible', 'qacontact_accessible',
+        'commenter', 'owner_idle_time', 'attachments.submitter', 'days_elapsed', 'percentage_complete')"
+    );
 }
 
 # Get choice value object for a bug or for a hashref with default value names

Bugzilla/Language/en.pm

@@ -115,7 +115,7 @@ $Bugzilla::messages->{en} = {
         newcc                     => 'CC',
         op_sys                    => 'OS',
         owner_idle_time           => 'Time Since Assignee Touched',
-        percentage_complete       => '%Complete',
+        percentage_complete       => '% Complete',
         priority                  => 'Priority',
         product_id                => 'Product ID',
         product                   => 'Product',

Bugzilla/Search.pm

@@ -546,7 +546,8 @@ sub STATIC_COLUMNS
     };
 
     # Search-only fields that were previously in fielddefs
-    foreach my $col (qw(requestees.login_name setters.login_name longdescs.isprivate content commenter owner_idle_time attachments.submitter))
+    foreach my $col (qw(requestees.login_name setters.login_name longdescs.isprivate content commenter
+        owner_idle_time attachments.submitter days_elapsed percentage_complete))
     {
         $columns->{$col}->{title} = Bugzilla->messages->{field_descs}->{$col};
     }

config.cgi

@@ -105,8 +105,9 @@ $vars->{'closed_status'} = \@closed_status;
 # Generate a list of fields that can be queried.
 my @fields = Bugzilla->get_fields({obsolete => 0});
 # Exclude fields the user cannot query.
-if (!Bugzilla->user->is_timetracker) {
-    @fields = grep { $_->name !~ /^(estimated_time|remaining_time|work_time|percentage_complete|deadline)$/ } @fields;
+if (!Bugzilla->user->is_timetracker)
+{
+    @fields = grep { !TIMETRACKING_FIELDS->{$_->name} } @fields;
 }
 $vars->{'field'} = \@fields;
 

editcheckers.cgi

@@ -109,7 +109,7 @@ else
     # Есть специальное поле "longdesc", означающее добавление комментариев
     my $f = [ Bugzilla->get_fields ];
     @$f = sort { lc $a->description cmp lc $b->description } grep { $_->name !~ /
-        \. | ^cclist_accessible$ | ^creation_ts$ | ^days_elapsed$ | ^reporter_accessible$ /xs } @$f;
+        \. | ^cclist_accessible$ | ^creation_ts$ | ^reporter_accessible$ /xs } @$f;
     # Ещё есть специальное поле "work_time_date", означающее списание времени задним числом
     push @$f, { description => 'Backdated worktime', name => 'work_time_date' };
     $vars->{my_fielddefs} = $f;

importxls.cgi

@@ -78,7 +78,7 @@ my $field_descs = { map { $_->name => $_->description } Bugzilla->get_fields({ o
 $field_descs->{platform} = $field_descs->{rep_platform} if $field_descs->{rep_platform};
 $field_descs->{comment} = $field_descs->{longdesc};
 for ((grep { /\./ } keys %$field_descs), (qw/rep_platform longdesc bug_group changeddate commenter content opendate
-    creation_ts delta_ts days_elapsed everconfirmed percentage_complete work_time/))
+    creation_ts delta_ts everconfirmed work_time/))
 {
     delete $field_descs->{$_};
 }

qa/t/webservice_bug_fields.t

@@ -28,7 +28,6 @@ use constant GLOBAL_GENERAL_FIELDS => qw(
     cc
     classification
     creation_ts
-    days_elapsed
     delta_ts
     dependson
     everconfirmed
@@ -45,7 +44,6 @@ use constant GLOBAL_GENERAL_FIELDS => qw(
 
     deadline
     estimated_time
-    percentage_complete
     remaining_time
     work_time
 );