diff options
author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-06-24 02:39:11 +0200 |
---|---|---|
committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-06-24 02:39:11 +0200 |
commit | 8f33041e6542f12e6897ef6ed7a67c43a118c504 (patch) | |
tree | c5caf60f706dfa1043a69e135b5246bd63455aae /Bugzilla/Keyword.pm | |
parent | 0a4878ccff5b9c281b018ad6c13fa5ac40986708 (diff) | |
download | bugzilla-8f33041e6542f12e6897ef6ed7a67c43a118c504.tar.gz bugzilla-8f33041e6542f12e6897ef6ed7a67c43a118c504.tar.xz |
Bug 572602: Change the way that Bugzilla::Object determines what fields
are required for create(). It now assumes that any column that is NOT NULL
and has not DEFAULT in the database is required. We also shift the burden
of throwing errors about empty values to the validators. This fixes the bug
that Bugzilla::Bug->create() wasn't populating default values for fields
if they weren't specified in the create() parameters.
r=timello, a=mkanat
Diffstat (limited to 'Bugzilla/Keyword.pm')
-rw-r--r-- | Bugzilla/Keyword.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Bugzilla/Keyword.pm b/Bugzilla/Keyword.pm index 882adaf02..e2ecc29e5 100644 --- a/Bugzilla/Keyword.pm +++ b/Bugzilla/Keyword.pm @@ -35,8 +35,6 @@ use constant DB_COLUMNS => qw( use constant DB_TABLE => 'keyworddefs'; -use constant REQUIRED_CREATE_FIELDS => qw(name description); - use constant VALIDATORS => { name => \&_check_name, description => \&_check_description, @@ -106,7 +104,9 @@ sub _check_name { my ($self, $name) = @_; $name = trim($name); - $name eq "" && ThrowUserError("keyword_blank_name"); + if (!defined $name or $name eq "") { + ThrowUserError("keyword_blank_name"); + } if ($name =~ /[\s,]/) { ThrowUserError("keyword_invalid_name"); } @@ -124,7 +124,9 @@ sub _check_name { sub _check_description { my ($self, $desc) = @_; $desc = trim($desc); - $desc eq '' && ThrowUserError("keyword_blank_description"); + if (!defined $desc or $desc eq '') { + ThrowUserError("keyword_blank_description"); + } return $desc; } |