diff options
| author | Simon Green <sgreen@redhat.com> | 2014-02-26 23:33:45 +0100 |
|---|---|---|
| committer | Simon Green <sgreen@redhat.com> | 2014-02-26 23:33:45 +0100 |
| commit | 3776f86ebdfb6169a35c525ce6b8363eb0cabbe1 (patch) | |
| tree | a4c68a99923b16df2628af32e3a20064cdbe84b0 /Bugzilla | |
| parent | 64f44ef195aedfa291ffa474fab1db13624f60d7 (diff) | |
| download | bugzilla-3776f86ebdfb6169a35c525ce6b8363eb0cabbe1.tar.gz bugzilla-3776f86ebdfb6169a35c525ce6b8363eb0cabbe1.tar.xz | |
Bug 466178 - Add an INTEGER custom field type
r=glob, a=justdave
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Bug.pm | 24 | ||||
| -rw-r--r-- | Bugzilla/Constants.pm | 6 | ||||
| -rw-r--r-- | Bugzilla/Field.pm | 1 |
3 files changed, 29 insertions, 2 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index dd22426bb..a6347cb2e 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -158,6 +158,9 @@ sub VALIDATORS { elsif ($field->type == FIELD_TYPE_TEXTAREA) { $validator = \&_check_textarea_field; } + elsif ($field->type == FIELD_TYPE_INTEGER) { + $validator = \&_check_integer_field; + } else { $validator = \&_check_default_field; } @@ -2110,6 +2113,27 @@ sub _check_textarea_field { return $text; } +sub _check_integer_field { + my ($invocant, $value, $field) = @_; + $value = defined($value) ? trim($value) : ''; + + if ($value eq '') { + return 0; + } + + my $orig_value = $value; + if (!detaint_signed($value)) { + ThrowUserError("number_not_integer", + {field => $field, num => $orig_value}); + } + elsif ($value > MAX_INT_32) { + ThrowUserError("number_too_large", + {field => $field, num => $orig_value, max_num => MAX_INT_32}); + } + + return $value; +} + sub _check_relationship_loop { # Generates a dependency tree for a given bug. Calls itself recursively # to generate sub-trees for the bug's dependencies. diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 7154d4536..a296e2e25 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -111,8 +111,9 @@ use Memoize; FIELD_TYPE_BUG_ID FIELD_TYPE_BUG_URLS FIELD_TYPE_KEYWORDS + FIELD_TYPE_INTEGER FIELD_TYPE_HIGHEST_PLUS_ONE - + EMPTY_DATETIME_REGEX ABNORMAL_SELECTS @@ -398,9 +399,10 @@ use constant FIELD_TYPE_BUG_ID => 6; use constant FIELD_TYPE_BUG_URLS => 7; use constant FIELD_TYPE_KEYWORDS => 8; use constant FIELD_TYPE_DATE => 9; +use constant FIELD_TYPE_INTEGER => 10; # Add new field types above this line, and change the below value in the # obvious fashion -use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 10; +use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 11; use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/; diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm index dce16f83b..fd71cc321 100644 --- a/Bugzilla/Field.pm +++ b/Bugzilla/Field.pm @@ -153,6 +153,7 @@ use constant SQL_DEFINITIONS => { FIELD_TYPE_DATETIME, { TYPE => 'DATETIME' }, FIELD_TYPE_DATE, { TYPE => 'DATE' }, FIELD_TYPE_BUG_ID, { TYPE => 'INT3' }, + FIELD_TYPE_INTEGER, { TYPE => 'INT4', NOTNULL => 1, DEFAULT => 0 }, }; # Field definitions for the fields that ship with Bugzilla. |