Download as
Browse Code »

Commit 05dce99b95aea9cc36deb6d0f1fe3cb498be9abb

Authored by Gabriela Navarro
Committed by Arthur Esposte
1 parent a04fdedc
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

instituion_fields: New validations to institution. 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 2 changed files with 19 additions and 3 deletions   Show diff stats
lib/institution.rb
  Diff comments   View file @05dce99
... ... @@ -15,11 +15,13 @@ class Institution &lt; ActiveRecord::Base
15 15 before_save :verify_institution_type
16 16  
17 17 belongs_to :community
18   -
  18 +
19 19 scope :search_institution, lambda{ |value|
20 20 where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" )
21 21 }
22 22  
  23 + validate :validate_country, :validate_state, :validate_city
  24 +
23 25 protected
24 26  
25 27 def verify_institution_type
... ... @@ -30,4 +32,16 @@ class Institution &lt; ActiveRecord::Base
30 32 false
31 33 end
32 34 end
  35 +
  36 + def validate_country
  37 + self.errors.add(:country, _("can't be blank")) if self.community.country.blank? && self.errors[:country].blank?
  38 + end
  39 +
  40 + def validate_state
  41 + self.errors.add(:state, _("can't be blank")) if self.community.state.blank? && self.errors[:state].blank?
  42 + end
  43 +
  44 + def validate_city
  45 + self.errors.add(:city, _("can't be blank")) if self.community.city.blank? && self.errors[:city].blank?
  46 + end
33 47 end
... ...
lib/public_institution.rb
  Diff comments   View file @05dce99
1 1 class PublicInstitution < Institution
2   - validates :acronym, :governmental_power, :governmental_sphere, :presence=>true
  2 + validates :governmental_power, :governmental_sphere, :juridical_nature, :presence=>true
  3 + validates_uniqueness_of :acronym, :allow_blank => true, :allow_nil => true
3 4 validates_uniqueness_of :cnpj, :unit_code, :allow_nil => true, :allow_blank => true
4 5 validates_format_of :cnpj, :with => /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/, :allow_nil => true, :allow_blank => true
5   -end
6 6 \ No newline at end of file
  7 +
  8 +end
... ...