Fix for using id in loading seeds.rb - unit tests will follow asap.
This commit is contained in:
parent
6eb460ac8a
commit
3066e49eb1
1 changed files with 2 additions and 2 deletions
|
@ -41,10 +41,10 @@ class ApplicationModel < ActiveRecord::Base
|
||||||
|
|
||||||
attr_accessor :history_changes_last_done
|
attr_accessor :history_changes_last_done
|
||||||
|
|
||||||
@@import_class_list = ['Ticket', 'Ticket::Article', 'History', 'Ticket::State', 'Ticket::Priority', 'Group', 'User' ]
|
@@import_class_list = ['Ticket', 'Ticket::Article', 'History', 'Ticket::State', 'Ticket::StateType', 'Ticket::Priority', 'Group', 'User', 'Role' ]
|
||||||
|
|
||||||
def check_attributes_protected
|
def check_attributes_protected
|
||||||
if Setting.get('import_mode') && @@import_class_list.include?( self.class.to_s )
|
if ( !Setting.get('system_init_done') || Setting.get('import_mode')) && @@import_class_list.include?( self.class.to_s )
|
||||||
# do noting, use id as it is
|
# do noting, use id as it is
|
||||||
else
|
else
|
||||||
self[:id] = nil
|
self[:id] = nil
|
||||||
|
|
Loading…
Reference in a new issue