Download as
Browse Code »

Commit b1dc2831822ab6ba4c3b52e7af152b5dff1a2ee9

Authored by Luciano Prestes
Committed by Fabio Teixeira
1 parent 74a7d6a4
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

Add maxlenght to name and finality in new_software 

Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Showing 2 changed files with 16 additions and 3 deletions   Show diff stats
lib/software_info.rb
  Diff comments   View file @b1dc283
... ... @@ -14,6 +14,8 @@ class SoftwareInfo &lt; ActiveRecord::Base
14 14  
15 15 has_one :software_categories
16 16  
  17 + validates_length_of :finality, :maximum => 100
  18 +
17 19 # used on find_by_contents
18 20 scope :like_search, lambda{ |name|
19 21 joins(:community).where("name ilike ?", "%#{name}%")
... ... @@ -92,18 +94,28 @@ class SoftwareInfo &lt; ActiveRecord::Base
92 94 }
93 95 }
94 96  
  97 + def validate_name_lenght
  98 + if self.community.name.size > 100
  99 + self.errors.add(:base, _("Name is too long (maximum is %{count} characters)"))
  100 + false
  101 + end
  102 + true
  103 + end
  104 +
95 105 def validate_operating_platform
96 106 self.errors.add(:operating_platform, _("can't be blank")) if self.operating_platform.blank? && self.errors.messages[:operating_platform].nil?
97 107 end
98 108  
99 109 def validate_acronym
100 110 self.acronym = "" if self.acronym.nil?
101   -
102 111 if self.acronym.length > 10 && self.errors.messages[:acronym].nil?
103 112 self.errors.add(:acronym, _("can't have more than 10 characteres"))
  113 + false
104 114 elsif self.acronym.match(/\s+/)
105 115 self.errors.add(:acronym, _("can't have whitespaces"))
  116 + false
106 117 end
  118 + true
107 119 end
108 120  
109 121 def valid_operating_systems
... ...
views/mpog_software_plugin_myprofile/new_software.html.erb
  Diff comments   View file @b1dc283
  1 +
1 2 <%= javascript_include_tag "mpog-validations" %>
2 3 <%= stylesheet_link_tag('plugins/mpog_software/mpog-software') %>
3 4  
... ... @@ -29,14 +30,14 @@
29 30  
30 31 <div id='software-name-field' class='formfield'>
31 32 <span id='software-hostname'><%= environment.default_hostname %>/</span>
32   - <%= required text_field(:community, :name) %>
  33 + <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %>
33 34 <%= content_tag(:small,_('Insert the name'), :id => 'name-balloon', :class => "helper-balloon") %>
34 35 </div>
35 36  
36 37 <%= fields_for @software_info do |swf| %>
37 38 <div class="formfield type-text">
38 39 <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %>
39   - <%= required swf.text_field(:finality) %>
  40 + <%= required swf.text_area(:finality, :cols => 40, :rows => 5, :maxlength => 100) %>
40 41 <%= content_tag(:small,_('Insert the finality'), :id => 'finality-balloon', :class => "helper-balloon") %>
41 42 </div>
42 43 <% end %>
... ...