Improved auto fill of created_by_id and updated_by_id.
This commit is contained in:
parent
df5107089a
commit
9ae1e69bd6
1 changed files with 5 additions and 6 deletions
|
@ -40,12 +40,12 @@ class ApplicationModel < ActiveRecord::Base
|
||||||
data
|
data
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# set created_by_id & updated_by_id if not given based on UserInfo
|
||||||
def fill_up_user_create
|
def fill_up_user_create
|
||||||
if self.class.column_names.include? 'updated_by_id'
|
if self.class.column_names.include? 'updated_by_id'
|
||||||
if UserInfo.current_user_id
|
if UserInfo.current_user_id
|
||||||
if self.updated_by_id && self.updated_by_id != UserInfo.current_user_id
|
if self.updated_by_id && self.updated_by_id != UserInfo.current_user_id
|
||||||
raise "WARNING: create - self.updated_by_id is different: #{self.updated_by_id.to_s}/#{UserInfo.current_user_id.to_s}"
|
puts "NOTICE create - self.updated_by_id is different: #{self.updated_by_id.to_s}/#{UserInfo.current_user_id.to_s}"
|
||||||
end
|
end
|
||||||
self.updated_by_id = UserInfo.current_user_id
|
self.updated_by_id = UserInfo.current_user_id
|
||||||
end
|
end
|
||||||
|
@ -53,18 +53,17 @@ class ApplicationModel < ActiveRecord::Base
|
||||||
if self.class.column_names.include? 'created_by_id'
|
if self.class.column_names.include? 'created_by_id'
|
||||||
if UserInfo.current_user_id
|
if UserInfo.current_user_id
|
||||||
if self.created_by_id && self.created_by_id != UserInfo.current_user_id
|
if self.created_by_id && self.created_by_id != UserInfo.current_user_id
|
||||||
raise "WARNING: create - self.created_by_id is different: #{self.created_by_id.to_s}/#{UserInfo.current_user_id.to_s}"
|
puts "NOTICE create - self.created_by_id is different: #{self.created_by_id.to_s}/#{UserInfo.current_user_id.to_s}"
|
||||||
end
|
end
|
||||||
self.created_by_id = UserInfo.current_user_id
|
self.created_by_id = UserInfo.current_user_id
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# set updated_by_id if not given based on UserInfo
|
||||||
def fill_up_user_update
|
def fill_up_user_update
|
||||||
return if !self.class.column_names.include? 'updated_by_id'
|
return if !self.class.column_names.include? 'updated_by_id'
|
||||||
if UserInfo.current_user_id
|
if UserInfo.current_user_id
|
||||||
# if self.updated_by_id && self.updated_by_id != UserInfo.current_user_id
|
|
||||||
# raise "WARNING: update - self.updated_by_id is different: #{self.updated_by_id.to_s}/#{UserInfo.current_user_id.to_s}"
|
|
||||||
# end
|
|
||||||
self.updated_by_id = UserInfo.current_user_id
|
self.updated_by_id = UserInfo.current_user_id
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue