Download as
Browse Code »

Commit 886a0f480051c898c6d3fa0d559dc25e015c573c

Authored by Fabio Teixeira
Committed by David Silva
1 parent 27953f72
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

Refactory library.rb 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 1 changed file with 6 additions and 20 deletions   Show diff stats
lib/library.rb
  Diff comments   View file @886a0f4
1 1 class Library < ActiveRecord::Base
2   -
3   - #TODO missing relations?
4   -
5 2 attr_accessible :name, :version, :license, :software_info_id
6 3  
7   - validate :validate_name, :validate_version, :validate_license
8   - validates :name, length: { within: 0..20 }
9   - validates_length_of :version, maximum: 20, too_long: _("Library is too long (maximum is 20 characters)")
10   - validates_length_of :license, maximum: 20, too_long: _("Library is too long (maximum is 20 characters)")
11   -
12   - def validate_name
13   - self.errors.add(:name, _("can't be blank")) if self.name.blank? && self.errors[:name].blank?
14   - end
15   -
16   - def validate_version
17   - self.errors.add(:version, _("can't be blank")) if self.version.blank? && self.errors[:version].blank?
18   - end
19   -
20   - def validate_license
21   - self.errors.add(:license, _("can't be blank")) if self.license.blank? && self.errors[:license].blank?
22   - end
23   -
  4 + validates :name, :version, :license,
  5 + presence: { message: _("can't be blank") },
  6 + length: {
  7 + maximum: 20,
  8 + too_long: _("Too long (maximum is 20 characters)")
  9 + }
24 10 end
... ...