scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed user without permissions bug [fixes SCI-922]

Browse source
This commit is contained in:
zmagod 2017-01-23 10:53:42 +01:00
parent 2d073c8c04
commit 20cde2654b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/application_helper.rb
View file

@ -118,7 +118,10 @@ module ApplicationHelper
match = el.match(sa_user)
user = User.find_by_id(match[2].base62_decode)
organization ||= current_organization
if user && organization
if user &&
organization &&
UserOrganization.user_in_organization(user, organization).any?
user_org = user
.user_organizations
.where('user_organizations.organization_id = ?',

5
app/models/user_organization.rb
View file

@ -30,6 +30,11 @@ class UserOrganization < ActiveRecord::Base
end
end
# returns user_organizations where the user is in org
def self.user_in_organization(user, organization)
where(user: user, organization: organization)
end
def destroy(new_owner)
# If any project of the organization has the sole owner and that
# owner is the user to be removed from the organization, then we must