gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update rolify and cancancan

Browse source
This commit is contained in:
Stella Rouzi 2016-03-04 19:33:06 +02:00
parent 9fbd2e9618
commit 40a48e1e7e
6 changed files with 359 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/role.rb
View file

@ -1,6 +1,6 @@
class Role < ActiveRecord::Base
belongs_to :resource, polymorphic: true
has_and_belongs_to_many :users
has_and_belongs_to_many :users, join_table: :users_roles
scopify

1
app/models/user.rb
View file

@ -29,7 +29,6 @@ class User < ActiveRecord::Base
devise(*devise_modules)
has_and_belongs_to_many :roles
has_many :openids
attr_accessor :login