diff options
| -rw-r--r-- | app/models/wiki_content.rb | 2 | ||||
| -rw-r--r-- | app/views/wiki/edit.html.erb | 2 | ||||
| -rw-r--r-- | db/migrate/20150921210243_change_wiki_contents_comments_limit_to_1024.rb | 11 | ||||
| -rw-r--r-- | test/functional/wiki_controller_test.rb | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index 992c7da34..223b6ca47 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -22,7 +22,7 @@ class WikiContent < ActiveRecord::Base belongs_to :page, :class_name => 'WikiPage' belongs_to :author, :class_name => 'User' validates_presence_of :text - validates_length_of :comments, :maximum => 255, :allow_nil => true + validates_length_of :comments, :maximum => 1024, :allow_nil => true attr_protected :id acts_as_versioned diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 2a2ba312a..566e96029 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -29,7 +29,7 @@ <% end %> <% end %> -<p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p> +<p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120, :maxlength => 1024 %></p> <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p> </div> diff --git a/db/migrate/20150921210243_change_wiki_contents_comments_limit_to_1024.rb b/db/migrate/20150921210243_change_wiki_contents_comments_limit_to_1024.rb new file mode 100644 index 000000000..5a35b03a1 --- /dev/null +++ b/db/migrate/20150921210243_change_wiki_contents_comments_limit_to_1024.rb @@ -0,0 +1,11 @@ +class ChangeWikiContentsCommentsLimitTo1024 < ActiveRecord::Migration + def self.up + change_column :wiki_content_versions, :comments, :string, :limit => 1024, :default => '' + change_column :wiki_contents, :comments, :string, :limit => 1024, :default => '' + end + + def self.down + change_column :wiki_content_versions, :comments, :string, :limit => 255, :default => '' + change_column :wiki_contents, :comments, :string, :limit => 255, :default => '' + end +end diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 9bffe66c7..5471fcf21 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -319,7 +319,7 @@ class WikiControllerTest < ActionController::TestCase put :update, :project_id => 1, :id => 'Another_page', :content => { - :comments => 'a' * 300, # failure here, comment is too long + :comments => 'a' * 1300, # failure here, comment is too long :text => 'edited' }, :wiki_page => { |