Bug 40933 - Reverse-merge

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@898 6955db30-a419-402b-8a0d-67ecbb4d7f56

Bugzilla.pm

@@ -650,17 +650,6 @@ sub get_fields {
     return @$fields;
 }
 
-sub field
-{
-    my $class = shift;
-    my $name = shift;
-    if (!exists $class->request_cache->{"field_$name"})
-    {
-        $class->request_cache->{"field_$name"} = Bugzilla::Field->new({ name => $name });
-    }
-    return $class->request_cache->{"field_$name"};
-}
-
 sub active_custom_fields {
     my $class = shift;
     if (!exists $class->request_cache->{active_custom_fields}) {

Bugzilla/Field.pm

@@ -102,7 +102,6 @@ use constant DB_COLUMNS => qw(
     buglist
     visibility_field_id
     value_field_id
-    enabled
 );
 
 use constant REQUIRED_CREATE_FIELDS => qw(name description);
@@ -116,7 +115,6 @@ use constant VALIDATORS => {
     obsolete    => \&_check_obsolete,
     sortkey     => \&_check_sortkey,
     type        => \&_check_type,
-    enabled     => \&Bugzilla::Object::check_boolean,
     visibility_field_id => \&_check_visibility_field_id,
 };
 
@@ -133,7 +131,7 @@ use constant UPDATE_COLUMNS => qw(
     buglist
     visibility_field_id
     value_field_id
-    enabled
+
     type
 );
 
@@ -433,19 +431,6 @@ sub obsolete { return $_[0]->{obsolete} }
 
 =over
 
-=item C<enabled>
-
-a true value tells Bugzilla not to display and not to use this field in any operations,
-though it could be present in the database.
-
-=back
-
-=cut
-
-sub enabled { return $_[0]->{enabled} }
-
-=over
-
 =item C<enter_bug>
 
 A boolean specifying whether or not this field should appear on 

extensions/custis/code/db_schema-abstract_schema.pl

@@ -90,6 +90,3 @@ $schema->{globalauth} = {
         globalauth_primary_idx => { FIELDS => ['id'], TYPE => 'UNIQUE' },
     ],
 };
-
-# Bug 55655 - Возможность смены типа или отключения стандартного поля "Приоритет"
-push @{$schema->{fielddefs}->{FIELDS}}, enabled => { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 1 };

extensions/custis/code/install-update_db.pl

@@ -166,9 +166,3 @@ if (!$dbh->bz_column_info('logincookies', 'session_data'))
 {
     $dbh->bz_add_column('logincookies', session_data => {TYPE => 'blob'});
 }
-
-# Bug 55655 - Возможность смены типа или отключения стандартного поля "Приоритет"
-if (!$dbh->bz_column_info('fielddefs', 'enabled'))
-{
-    $dbh->bz_add_column('fielddefs', enabled => { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 1 });
-}