From 8a1d45ffd6c66d76d3d9c03badef58858c98c060 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sat, 24 Jul 2010 00:20:35 +0000 Subject: [PATCH] Merged r3860 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3861 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/change.rb | 5 +++-- .../20100705164950_change_changes_path_length_limit.rb | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/change.rb b/app/models/change.rb index e5c1585b4..657652c9d 100644 --- a/app/models/change.rb +++ b/app/models/change.rb @@ -19,12 +19,13 @@ class Change < ActiveRecord::Base belongs_to :changeset validates_presence_of :changeset_id, :action, :path + before_save :init_path def relative_path changeset.repository.relative_path(path) end - def before_save - path ||= "" + def init_path + self.path ||= "" end end diff --git a/db/migrate/20100705164950_change_changes_path_length_limit.rb b/db/migrate/20100705164950_change_changes_path_length_limit.rb index 62ba4ec22..62b8644a4 100644 --- a/db/migrate/20100705164950_change_changes_path_length_limit.rb +++ b/db/migrate/20100705164950_change_changes_path_length_limit.rb @@ -1,6 +1,9 @@ class ChangeChangesPathLengthLimit < ActiveRecord::Migration def self.up + # these are two steps to please MySQL 5 on Win32 + change_column :changes, :path, :text, :default => nil, :null => true change_column :changes, :path, :text, :null => false + change_column :changes, :from_path, :text end -- 2.39.5