Commit aaad2520af1fafc3eb62fd6903f381882061b70d
1 parent
a9488e76
Exists in
master
and in
3 other branches
Remove CNPJ validations
Showing
4 changed files
with
11 additions
and
5 deletions
Show diff stats
db/migrate/20150910135510_add_siorg_code_to_institution.rb
0 → 100644
lib/institution.rb
| @@ -20,10 +20,9 @@ class Institution < ActiveRecord::Base | @@ -20,10 +20,9 @@ class Institution < ActiveRecord::Base | ||
| 20 | :sub_juridical_nature, :normalization_level, | 20 | :sub_juridical_nature, :normalization_level, |
| 21 | :version, :cnpj, :type, :governmental_power, | 21 | :version, :cnpj, :type, :governmental_power, |
| 22 | :governmental_sphere, :sisp, :juridical_nature, | 22 | :governmental_sphere, :sisp, :juridical_nature, |
| 23 | - :corporate_name | 23 | + :corporate_name, :siorg_code, :community |
| 24 | 24 | ||
| 25 | validates :name, :presence=>true, :uniqueness=>true | 25 | validates :name, :presence=>true, :uniqueness=>true |
| 26 | - validates :cnpj, :uniqueness=>true | ||
| 27 | 26 | ||
| 28 | before_save :verify_institution_type | 27 | before_save :verify_institution_type |
| 29 | 28 |
lib/private_institution.rb
lib/public_institution.rb
| @@ -5,8 +5,6 @@ class PublicInstitution < Institution | @@ -5,8 +5,6 @@ class PublicInstitution < Institution | ||
| 5 | validates :acronym, :allow_blank => true, :allow_nil => true, | 5 | validates :acronym, :allow_blank => true, :allow_nil => true, |
| 6 | :uniqueness=>true | 6 | :uniqueness=>true |
| 7 | 7 | ||
| 8 | - validates :cnpj, :uniqueness=>true | ||
| 9 | - | ||
| 10 | validates_format_of( | 8 | validates_format_of( |
| 11 | :cnpj, | 9 | :cnpj, |
| 12 | :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/, | 10 | :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/, |