From: lpsolit%gmail.com <>
Date: Fri, 30 Oct 2009 01:14:11 +0000 (+0000)
Subject: Bug 460742: The type should be mandatory to create a custom field - Patch by Nitish... 
X-Git-Tag: bugzilla-3.5.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c3a0bfc4382502094d4edfb200da1395bba1568;p=thirdparty%2Fbugzilla.git

Bug 460742: The type should be mandatory to create a custom field - Patch by Nitish Bezzala <nbezzala@yahoo.com> r/a=mkanat
---

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index a2a08cd4b0..077c67e20e 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -837,6 +837,11 @@ sub run_create_validators {
                                      $params->{visibility_field_id});
 
     my $type = $params->{type} || 0;
+    
+    if ($params->{custom} && !$type) {
+        ThrowCodeError('field_type_not_specified');
+    }
+    
     $params->{value_field_id} = 
         $class->_check_value_field_id($params->{value_field_id},
             ($type == FIELD_TYPE_SINGLE_SELECT 
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 3c9f73f4c4..64bd41af3a 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -154,13 +154,17 @@
     to generate the right class (you can't call class methods directly
     on Bugzilla::Field::Choice).
 
+  [% ELSIF error == "field_not_custom" %]
+    '[% field.description FILTER html %]' ([% field.name FILTER html %])
+    is not a custom field.
+
   [% ELSIF error == "field_type_mismatch" %]
     Cannot seem to handle <code>[% field FILTER html %]</code>
     and <code>[% type FILTER html %]</code> together.
 
-  [% ELSIF error == "field_not_custom" %]
-    '[% field.description FILTER html %]' ([% field.name FILTER html %])
-    is not a custom field.
+  [% ELSIF error == "field_type_not_specified" %]
+    [% title = "Field Type Not Specified" %]
+    You must specify a type when creating a custom field.
 
   [% ELSIF error == "illegal_content_type_method" %]
     Your form submission got corrupted somehow.  The <em>content