Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

hacking possibly advantageous SQL for WorkPackage.allowed_to

ulfertsf2fdc7ad5d70
diff --git a/app/models/projects/scopes/allowed_to.rb b/app/models/projects/scopes/allowed_to.rb
index 831d6b60a4d..59dcb75445c 100644
--- a/app/models/projects/scopes/allowed_to.rb
+++ b/app/models/projects/scopes/allowed_to.rb
@@ -35,7 +35,7 @@ module Projects::Scopes
class_methods do
# Returns an ActiveRecord::Relation to find all entries for which
# +user+ has the given +permission+.
- def allowed_to(user, permission)
+ def allowed_to(user, permission, entity_types: [])
permissions = allowed_to_permissions(permission)
return none if user.locked?
@@ -46,7 +46,7 @@ module Projects::Scopes
elsif user.anonymous?
allowed_to_anonymous(user, permissions)
else
- allowed_to_member(user, permissions)
+ allowed_to_member(user, permissions, entity_types)
end
end
@@ -104,21 +104,30 @@ module Projects::Scopes
where(id: allowed_to_non_member_relation(user, permissions))
end
- def allowed_to_member(user, permissions)
- allowed_via_membership = allowed_to_member_relation(user, permissions).select(arel_table[:id]).arel
+ def allowed_to_member(user, permissions, entity_types)
+ allowed_via_membership = allowed_to_member_relation(user, permissions, entity_types).select(arel_table[:id]).arel
allowed_via_non_member = allowed_to_non_member_relation(user, permissions).select(:id).arel
where(arel_table[:id].in(Arel::Nodes::UnionAll.new(allowed_via_membership, allowed_via_non_member)))
end
+ def allowed_to_member_union(user, permissions, entity_types: [])
+ allowed_via_membership = allowed_to_member_relation(user, permissions, entity_types).select(arel_table[:id],
+ "members.entity_id").arel
+ allowed_via_non_member = allowed_to_non_member_relation(user, permissions).select(:id, "null AS entity_id").arel
+
+ Arel::Nodes::UnionAll.new(allowed_via_membership, allowed_via_non_member)
+ end
+ public :allowed_to_member_union
+
def allowed_to_admin_relation(permissions)
joins(allowed_to_enabled_module_join(permissions))
.where(Project.arel_table[:active].eq(true))
end
- def allowed_to_member_relation(user, permissions)
+ def allowed_to_member_relation(user, permissions, entity_types)
Member
- .where(member_conditions(user))
+ .where(member_conditions(user, entity_types))
.joins(allowed_to_member_in_active_project_join)
.joins(allowed_to_enabled_module_join(permissions))
.joins(:roles)
@@ -171,10 +180,13 @@ module Projects::Scopes
.join_sources
end
- def member_conditions(user)
+ def member_conditions(user, entity_types = [])
+ entity_condition = entity_types.reduce(Member.arel_table[:entity_type].eq(nil)) do |acc, entity_type|
+ acc.or(Member.arel_table[:entity_type].eq(entity_type))
+ end
+
Member.arel_table[:user_id].eq(user.id)
- .and(Member.arel_table[:entity_id].eq(nil))
- .and(Member.arel_table[:entity_type].eq(nil))
+ .and(entity_condition)
end
def allowed_to_permissions(permission)
diff --git a/app/models/work_packages/scopes/allowed_to.rb b/app/models/work_packages/scopes/allowed_to.rb
index 488ccbc237f..620d5c2bffc 100644
--- a/app/models/work_packages/scopes/allowed_to.rb
+++ b/app/models/work_packages/scopes/allowed_to.rb
@@ -47,11 +47,30 @@ module WorkPackages::Scopes
elsif user.anonymous?
where(project_id: Project.allowed_to(user, permissions))
else
- allowed_via_wp_membership = allowed_to_member_relation(user, permissions)
- allowed_via_project_membership = Project.unscoped.allowed_to(user, permissions)
-
- where(project_id: allowed_via_project_membership.select(:id))
- .or(where(id: allowed_via_wp_membership.select(arel_table[:id])))
+ # allowed_via_wp_membership = allowed_to_member_relation(user, permissions)
+ allowed_via_project_or_work_package_membership = Project.unscoped.allowed_to_member_union(user,
+ permissions,
+ entity_types: ["WorkPackage"])
+
+ allowed_by_projects_and_work_packages = Arel.sql(<<~SQL.squish)
+ SELECT * from work_packages
+ WHERE project_id in (SELECT id FROM allowed_projects)
+ /* Take all work packages allowed by either project wide or entity specific membership
+ But now remove all those that are in a project for which an entity specific membership exists (but is not for that entity)
+ unless there is also a project specific membership in that same project. */
+ AND NOT EXISTS (
+ SELECT 1 FROM allowed_projects
+ WHERE allowed_projects.id = project_id AND allowed_projects.entity_id IS NOT NULL AND allowed_projects.entity_id != work_packages.id
+ AND NOT EXISTS (
+ SELECT 1 FROM allowed_projects
+ WHERE allowed_projects.id = project_id AND allowed_projects.entity_id IS NULL
+ )
+ )
+ SQL
+
+ with(allowed_projects: Arel.sql(allowed_via_project_or_work_package_membership.to_sql),
+ allowed_by_projects_and_work_packages:)
+ .from("allowed_by_projects_and_work_packages work_packages")
end
end