Adapt for Redmine 4

webit-de · Dec 13, 2018 · 93c49a9 · 93c49a9
1 parent a530b21
commit 93c49a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/db/migrate/0001_add_en_name_to_user.rb b/db/migrate/0001_add_en_name_to_user.rb
@@ -1,4 +1,4 @@
-class AddEnNameToUser < ActiveRecord::Migration
+class AddEnNameToUser < Rails.version < '5.0' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
 
   def self.up
     add_column(:users, "name_in_english", :string)

diff --git a/lib/localizable/user_patch.rb b/lib/localizable/user_patch.rb
@@ -17,7 +17,8 @@ def self.included(base)
         unloadable # Send unloadable so it will not be unloaded in development.
         safe_attributes 'name_in_english'
 
-        alias_method_chain :name, :localizable
+        alias_method :name_without_localizable, :name
+        alias_method :name, :name_with_localizable
       end
     end
   end