Merge pull request #820 from differentreality/update_rolify

update rolify
2016-03-09 11:32:52 +01:00 · 2016-03-09 11:32:52 +01:00 · 0df693ffbf
commit 0df693ffbf
parent 782a1f071f 34f2c1f395
6 changed files with 351 additions and 347 deletions
--- a/app/models/role.rb
+++ b/app/models/role.rb
@ -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

--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -29,7 +29,6 @@ class User < ActiveRecord::Base

  devise(*devise_modules)

-  has_and_belongs_to_many :roles
  has_many :openids

  attr_accessor :login