Remove before filter in user.rb in addition to the previous fix (Fix for user and role relationship)
This commit is contained in:
parent
1857ad428c
commit
8ad015af7f
|
@ -42,7 +42,6 @@ class User
|
||||||
|
|
||||||
before_create :initialize_desktop
|
before_create :initialize_desktop
|
||||||
before_save :rebuild_status_record
|
before_save :rebuild_status_record
|
||||||
before_save :save_roles
|
|
||||||
scope :remote_account, where(:nccu_id.ne => nil)
|
scope :remote_account, where(:nccu_id.ne => nil)
|
||||||
scope :not_guest_user, all_of(:name.ne => "guest")
|
scope :not_guest_user, all_of(:name.ne => "guest")
|
||||||
|
|
||||||
|
@ -273,10 +272,6 @@ class User
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
def save_roles
|
|
||||||
# self.roles = self.sub_roles.collect{|t| t.role}.uniq
|
|
||||||
self.roles = self.roles.uniq
|
|
||||||
end
|
|
||||||
|
|
||||||
def rebuild_status_record
|
def rebuild_status_record
|
||||||
self.status_record = {}
|
self.status_record = {}
|
||||||
|
|
Loading…
Reference in New Issue