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

fix include spent time and visible scope

Klaus Zanderse51b0020d4e8
diff --git a/app/models/work_packages/scopes/include_spent_time.rb b/app/models/work_packages/scopes/include_spent_time.rb
index ac0cfe3ced1..3a83cf1c627 100644
--- a/app/models/work_packages/scopes/include_spent_time.rb
+++ b/app/models/work_packages/scopes/include_spent_time.rb
@@ -49,11 +49,17 @@ module WorkPackages::Scopes::IncludeSpentTime
def join_visible_time_entries
wp_table
.outer_join(visible_time_entries_cte)
- .on(visible_time_entries_cte[:work_package_id].eq(wp_descendants[:id]))
+ .on(entity_join)
end
def allowed_to_view_time_entries(user)
- TimeEntry.not_ongoing.visible(user).select(:id, :work_package_id, :hours).arel
+ TimeEntry.not_ongoing.visible(user).select(:id, :entity_type, :entity_id, :hours).arel
+ end
+
+ def entity_join
+ visible_time_entries_cte[:entity_type].eq("WorkPackage").and(
+ visible_time_entries_cte[:entity_id].eq(wp_descendants[:id])
+ )
end
def wp_table
diff --git a/modules/costs/app/models/cost_scopes.rb b/modules/costs/app/models/cost_scopes.rb
index 9fc85a1686e..3881c3221a2 100644
--- a/modules/costs/app/models/cost_scopes.rb
+++ b/modules/costs/app/models/cost_scopes.rb
@@ -55,11 +55,14 @@ module CostScopes
# so we need to figure out the correct scope to use
wp_scoped_permission = Authorization.permissions_for(allowed_own_permission).any?(&:work_package?)
+ # TODO: Add other entity types
if wp_scoped_permission
project_allowed_scope.or(
- table[:work_package_id]
- .in(WorkPackage.allowed_to(user, allowed_own_permission).select(:id).arel)
- .and(table[:user_id].eq(user.id))
+ table[:entity_type].eq("WorkPackage").and(
+ table[:entity_id]
+ .in(WorkPackage.allowed_to(user, allowed_own_permission).select(:id).arel)
+ .and(table[:user_id].eq(user.id))
+ )
)
else
project_allowed_scope.or(
diff --git a/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb b/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
index 74a5a4c9def..91bedced386 100644
--- a/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
+++ b/modules/costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe API::V3::WorkPackages::WorkPackageRepresenter do
let(:cost_entry_1) do
create(:cost_entry,
- work_package:,
+ entity: work_package,
project:,
units: 3,
spent_on: Time.zone.today,
@@ -55,7 +55,7 @@ RSpec.describe API::V3::WorkPackages::WorkPackageRepresenter do
end
let(:cost_entry_2) do
create(:cost_entry,
- work_package:,
+ entity: work_package,
project:,
units: 3,
spent_on: Time.zone.today,
@@ -107,7 +107,7 @@ RSpec.describe API::V3::WorkPackages::WorkPackageRepresenter do
let(:time_entry) do
create(:time_entry,
project: work_package.project,
- work_package:,
+ entity: work_package,
hours: 1.0)
end
@@ -120,7 +120,7 @@ RSpec.describe API::V3::WorkPackages::WorkPackageRepresenter do
let(:time_entry) do
create(:time_entry,
project: work_package.project,
- work_package:,
+ entity: work_package,
hours: 42.5)
end
@@ -143,7 +143,7 @@ RSpec.describe API::V3::WorkPackages::WorkPackageRepresenter do
let!(:own_time_entry) do
create(:time_entry,
project: work_package.project,
- work_package:,
+ entity: work_package,
hours: 2,
user: user2)
end
@@ -151,7 +151,7 @@ RSpec.describe API::V3::WorkPackages::WorkPackageRepresenter do
let!(:other_time_entry) do
create(:time_entry,
project: work_package.project,
- work_package:,
+ entity: work_package,
hours: 1,
user:)
end