gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2965 from AndrewKvalheim/users-role-versions

Browse source 
Fix bug in which role assignments aren’t tracked in version history
This commit is contained in:
Henne Vogelsang 2022-03-08 13:21:04 +01:00 • committed by GitHub
commit 9da3bf9337
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -23,8 +23,8 @@ class User < ApplicationRecord
end end
has_many :users_roles has_many :users_roles
has_many :roles, through: :users_roles, dependent: :destroy
rolify rolify
has_many :roles, through: :users_roles, dependent: :destroy
has_paper_trail on: [:create, :update], ignore: [:sign_in_count, :remember_created_at, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip, :unconfirmed_email, has_paper_trail on: [:create, :update], ignore: [:sign_in_count, :remember_created_at, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip, :unconfirmed_email,
:avatar_content_type, :avatar_file_size, :avatar_updated_at, :updated_at, :confirmation_sent_at, :confirmation_token, :reset_password_token] :avatar_content_type, :avatar_file_size, :avatar_updated_at, :updated_at, :confirmation_sent_at, :confirmation_token, :reset_password_token]

1
spec/features/versions_spec.rb
View file

@ -344,7 +344,6 @@ feature 'Version' do
end end
scenario 'display changes in users_role for conference role', feature: true, versioning: true, js: true do scenario 'display changes in users_role for conference role', feature: true, versioning: true, js: true do
skip('fails since paper_trail 12.2.0')
user = create(:user) user = create(:user)
role = Role.find_by(name: 'cfp', resource_id: conference.id, resource_type: 'Conference') role = Role.find_by(name: 'cfp', resource_id: conference.id, resource_type: 'Conference')
user.add_role :cfp, conference user.add_role :cfp, conference