diff --git a/app/models/membership.rb b/app/models/membership.rb index c1a85bd98..9e03ca517 100644 --- a/app/models/membership.rb +++ b/app/models/membership.rb @@ -17,10 +17,6 @@ class Membership < ActiveRecord::Base joins(@parent).where(state: states[:active]).merge(parent_class.public_scope) } - def self.joins_for - @parent - end - def disable! inactive! end diff --git a/app/models/user_group.rb b/app/models/user_group.rb index f9957f48e..9b8e3c653 100644 --- a/app/models/user_group.rb +++ b/app/models/user_group.rb @@ -32,25 +32,6 @@ class UserGroup < ActiveRecord::Base using: :trigram, ranked_by: ":trigram" - def self.memberships_query(action, target) - target.memberships_for(action) - end - - def self.joins_for - :memberships - end - - def self.private_query(action, target, roles) - joins(:memberships).merge(target.memberships_for(action, self)) - .where(memberships: { identity: false }) - end - - def self.user_can_access_scope(private_query, public_flag) - scope = where(id: private_query.select(:id)) - scope = scope.or(public_scope) if public_flag - scope - end - def self.roles_allowed_to_access(action, klass=nil) roles = case action when :show, :index