diff --git a/app/models/token_permission.rb b/app/models/token_permission.rb deleted file mode 100644 index 53d8567..0000000 --- a/app/models/token_permission.rb +++ /dev/null @@ -1,10 +0,0 @@ -class TokenPermission < ActiveRecord::Base - attr_accessible :token_permission_type_id, :token_permission_type, :api_token, :user_id, :user, :as => [:default, :admin] - - #associations between tables - belongs_to :token_permission_type - belongs_to :user - - - -end diff --git a/app/models/user.rb b/app/models/user.rb index 79c4b8d..2c0064b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,7 +14,6 @@ has_many :project_groups, :dependent => :destroy has_many :organisations , through: :user_org_roles has_many :user_role_types, through: :user_org_roles - has_many :token_permissions