Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'class_attribute_fix'

Conflicts:
	lib/formtastic.rb
  • Loading branch information...
commit 5db7ce6f4ce28e5e86ac80079afddba856184424 1 parent 691f947
@justinfrench authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/formtastic.rb
View
2  lib/formtastic.rb
@@ -1694,7 +1694,7 @@ def get_maxlength_for(method)
if type == :text
{ :rows => default_text_area_height,
:cols => default_text_area_width }
- elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
+ elsif (type == :numeric) || !column.respond_to?(:limit) || column.nil? || column.limit.nil?
{ :maxlength => validation_max_limit,
:size => default_text_field_size }
else
Please sign in to comment.
Something went wrong with that request. Please try again.