summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extensions/TrackingFlags/Extension.pm1
-rw-r--r--extensions/TrackingFlags/lib/Admin.pm5
-rw-r--r--extensions/TrackingFlags/lib/Flag.pm8
-rw-r--r--extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl6
4 files changed, 2 insertions, 18 deletions
diff --git a/extensions/TrackingFlags/Extension.pm b/extensions/TrackingFlags/Extension.pm
index 42b3b9f03..6172f0ffc 100644
--- a/extensions/TrackingFlags/Extension.pm
+++ b/extensions/TrackingFlags/Extension.pm
@@ -59,7 +59,6 @@ sub template_before_process {
{
$vars->{'tracking_flags'} = Bugzilla::Extension::TrackingFlags::Flag->match({
product => $vars->{'product'}->name,
- enter_bug => 1,
is_active => 1,
});
diff --git a/extensions/TrackingFlags/lib/Admin.pm b/extensions/TrackingFlags/lib/Admin.pm
index c87570632..3529d30a7 100644
--- a/extensions/TrackingFlags/lib/Admin.pm
+++ b/extensions/TrackingFlags/lib/Admin.pm
@@ -110,7 +110,6 @@ sub admin_edit {
}
$flag->set_sortkey(_next_unique_sortkey($flag->sortkey));
$flag->set_type($flag->flag_type);
- $flag->set_enter_bug($flag->enter_bug);
# always default new flags as active, even when copying an inactive one
$flag->set_is_active(1);
@@ -123,7 +122,6 @@ sub admin_edit {
$vars->{mode} = 'new';
$vars->{flag} = {
sortkey => 0,
- enter_bug => 1,
is_active => 1,
};
$vars->{values} = _flag_values_to_json([
@@ -151,12 +149,10 @@ sub _load_from_input {
description => trim($input->{flag_desc} || ''),
sortkey => $input->{flag_sort} || 0,
type => trim($input->{flag_type} || ''),
- enter_bug => $input->{flag_enter_bug} ? 1 : 0,
is_active => $input->{flag_active} ? 1 : 0,
};
detaint_natural($flag->{id});
detaint_natural($flag->{sortkey});
- detaint_natural($flag->{enter_bug});
detaint_natural($flag->{is_active});
# values
@@ -293,7 +289,6 @@ sub _update_db_flag {
description => $flag->{description},
sortkey => $flag->{sortkey},
type => $flag->{type},
- enter_bug => $flag->{enter_bug},
is_active => $flag->{is_active},
};
diff --git a/extensions/TrackingFlags/lib/Flag.pm b/extensions/TrackingFlags/lib/Flag.pm
index b7abe97d2..f35b661eb 100644
--- a/extensions/TrackingFlags/lib/Flag.pm
+++ b/extensions/TrackingFlags/lib/Flag.pm
@@ -35,7 +35,6 @@ use constant DB_COLUMNS => qw(
description
type
sortkey
- enter_bug
is_active
);
@@ -46,7 +45,6 @@ use constant UPDATE_COLUMNS => qw(
description
type
sortkey
- enter_bug
is_active
);
@@ -55,8 +53,8 @@ use constant VALIDATORS => {
description => \&_check_description,
type => \&_check_type,
sortkey => \&_check_sortkey,
- enter_bug => \&Bugzilla::Object::check_boolean,
is_active => \&Bugzilla::Object::check_boolean,
+
};
use constant UPDATE_VALIDATORS => {
@@ -64,7 +62,6 @@ use constant UPDATE_VALIDATORS => {
description => \&_check_description,
type => \&_check_type,
sortkey => \&_check_sortkey,
- enter_bug => \&Bugzilla::Object::check_boolean,
is_active => \&Bugzilla::Object::check_boolean,
};
@@ -341,7 +338,6 @@ sub set_name { $_[0]->set('name', $_[1]); }
sub set_description { $_[0]->set('description', $_[1]); }
sub set_type { $_[0]->set('type', $_[1]); }
sub set_sortkey { $_[0]->set('sortkey', $_[1]); }
-sub set_enter_bug { $_[0]->set('enter_bug', $_[1]); }
sub set_is_active { $_[0]->set('is_active', $_[1]); }
###############################
@@ -353,7 +349,6 @@ sub name { return $_[0]->{'name'}; }
sub description { return $_[0]->{'description'}; }
sub flag_type { return $_[0]->{'type'}; }
sub sortkey { return $_[0]->{'sortkey'}; }
-sub enter_bug { return $_[0]->{'enter_bug'}; }
sub is_active { return $_[0]->{'is_active'}; }
sub values {
@@ -426,6 +421,7 @@ sub legal_values { return $_[0]->values; }
sub custom { return 1; }
sub in_new_bugmail { return 1; }
sub obsolete { return 0; }
+sub enter_bug { return 1; }
sub buglist { return 1; }
sub is_select { return 1; }
sub is_abnormal { return 1; }
diff --git a/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl b/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
index f239791c7..0c4a443f9 100644
--- a/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
@@ -98,12 +98,6 @@ var selected_components = [
</tr>
<tr>
- <th>Enter [% terms.Bug %]</th>
- <td><input type="checkbox" name="flag_enter_bug" id="flag_enter_bug" value="1" [% "checked" IF flag.enter_bug %]></td>
- <td class="help">can be set on [% terms.bug %] creation</td>
-</tr>
-
-<tr>
<th>Active</th>
<td><input type="checkbox" name="flag_active" id="flag_active" value="1" [% "checked" IF flag.is_active %]></td>
</tr>