redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NoMethodError for intersect if running on Ruby 2.7.6 #1500

Browse Source
This commit is contained in:
Karel Pičman 2024-01-09 13:15:57 +01:00
parent 94a654fb50
commit 0adcc6291c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/dmsf_folder.rb
View File

@ -125,13 +125,21 @@ class DmsfFolder < ApplicationRecord
if folder.dmsf_folder_permissions.any?
role_ids = User.current.roles_for_project(folder.project).map(&:id)
role_permission_ids = folder.dmsf_folder_permissions.roles.map(&:object_id)
if RUBY_VERSION < '3.1' # intersect? method added in Ruby 3.1, though we support 2.7 too
return true if role_ids.intersection(role_permission_ids).any?
elsif role_ids.intersect?(role_permission_ids)
return true
end
principal_ids = folder.dmsf_folder_permissions.users.map(&:object_id)
return true if principal_ids.include?(User.current.id)
user_group_ids = User.current.groups.map(&:id)
if RUBY_VERSION < '3.1' # intersect? method added in Ruby 3.1, though we support 2.7 too
principal_ids.intersection(user_group_ids).any?
else
principal_ids.intersect?(user_group_ids)
end
else
DmsfFolder.permissions? folder.dmsf_folder, allow_system: allow_system, file: file
end