Download as
Browse Code »

Commit b1dc2831822ab6ba4c3b52e7af152b5dff1a2ee9

Authored by Luciano Prestes
Committed by Fabio Teixeira
1 parent 74a7d6a4
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

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,6 +14,8 @@ class SoftwareInfo &lt; ActiveRecord::Base
14 14
15 has_one :software_categories 15 has_one :software_categories
16 16
  17 + validates_length_of :finality, :maximum => 100
  18 +
17 # used on find_by_contents 19 # used on find_by_contents
18 scope :like_search, lambda{ |name| 20 scope :like_search, lambda{ |name|
19 joins(:community).where("name ilike ?", "%#{name}%") 21 joins(:community).where("name ilike ?", "%#{name}%")
@@ -92,18 +94,28 @@ class SoftwareInfo &lt; ActiveRecord::Base @@ -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 def validate_operating_platform 105 def validate_operating_platform
96 self.errors.add(:operating_platform, _("can't be blank")) if self.operating_platform.blank? && self.errors.messages[:operating_platform].nil? 106 self.errors.add(:operating_platform, _("can't be blank")) if self.operating_platform.blank? && self.errors.messages[:operating_platform].nil?
97 end 107 end
98 108
99 def validate_acronym 109 def validate_acronym
100 self.acronym = "" if self.acronym.nil? 110 self.acronym = "" if self.acronym.nil?
101 -  
102 if self.acronym.length > 10 && self.errors.messages[:acronym].nil? 111 if self.acronym.length > 10 && self.errors.messages[:acronym].nil?
103 self.errors.add(:acronym, _("can't have more than 10 characteres")) 112 self.errors.add(:acronym, _("can't have more than 10 characteres"))
  113 + false
104 elsif self.acronym.match(/\s+/) 114 elsif self.acronym.match(/\s+/)
105 self.errors.add(:acronym, _("can't have whitespaces")) 115 self.errors.add(:acronym, _("can't have whitespaces"))
  116 + false
106 end 117 end
  118 + true
107 end 119 end
108 120
109 def valid_operating_systems 121 def valid_operating_systems
views/mpog_software_plugin_myprofile/new_software.html.erb
  Diff comments   View file @b1dc283
  1 +
1 <%= javascript_include_tag "mpog-validations" %> 2 <%= javascript_include_tag "mpog-validations" %>
2 <%= stylesheet_link_tag('plugins/mpog_software/mpog-software') %> 3 <%= stylesheet_link_tag('plugins/mpog_software/mpog-software') %>
3 4
@@ -29,14 +30,14 @@ @@ -29,14 +30,14 @@
29 30
30 <div id='software-name-field' class='formfield'> 31 <div id='software-name-field' class='formfield'>
31 <span id='software-hostname'><%= environment.default_hostname %>/</span> 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 <%= content_tag(:small,_('Insert the name'), :id => 'name-balloon', :class => "helper-balloon") %> 34 <%= content_tag(:small,_('Insert the name'), :id => 'name-balloon', :class => "helper-balloon") %>
34 </div> 35 </div>
35 36
36 <%= fields_for @software_info do |swf| %> 37 <%= fields_for @software_info do |swf| %>
37 <div class="formfield type-text"> 38 <div class="formfield type-text">
38 <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %> 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 <%= content_tag(:small,_('Insert the finality'), :id => 'finality-balloon', :class => "helper-balloon") %> 41 <%= content_tag(:small,_('Insert the finality'), :id => 'finality-balloon', :class => "helper-balloon") %>
41 </div> 42 </div>
42 <% end %> 43 <% end %>