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

Reintroduce `as:` for the relations

Klaus Zandersb4b56ab80bea
diff --git a/app/models/work_package.rb b/app/models/work_package.rb
index f7dba16408f..5c114af2168 100644
--- a/app/models/work_package.rb
+++ b/app/models/work_package.rb
@@ -59,7 +59,7 @@ class WorkPackage < ApplicationRecord
belongs_to :priority, class_name: "IssuePriority"
belongs_to :category, class_name: "Category", optional: true
- has_many :time_entries, dependent: :delete_all, inverse_of: :entity
+ has_many :time_entries, dependent: :delete_all, inverse_of: :entity, as: :entity
has_many :file_links, dependent: :delete_all, class_name: "Storages::FileLink", as: :container
has_many :storages, through: :project
diff --git a/app/models/work_packages/costs.rb b/app/models/work_packages/costs.rb
index 2ac797d5903..abc22c609c2 100644
--- a/app/models/work_packages/costs.rb
+++ b/app/models/work_packages/costs.rb
@@ -31,7 +31,7 @@ module WorkPackages::Costs
included do
belongs_to :budget, inverse_of: :work_packages, optional: true
- has_many :cost_entries, dependent: :delete_all, inverse_of: :entity
+ has_many :cost_entries, dependent: :delete_all, inverse_of: :entity, as: :entity
# disabled for now, implements part of ticket blocking
validate :validate_budget
diff --git a/spec/models/journable/timestamps_spec.rb b/spec/models/journable/timestamps_spec.rb
index c10768bf433..aca589f8688 100644
--- a/spec/models/journable/timestamps_spec.rb
+++ b/spec/models/journable/timestamps_spec.rb
@@ -279,6 +279,7 @@ RSpec.describe Journable::Timestamps do
ON "time_entries"."entity_type" = 'WorkPackage'
AND "time_entries"."entity_id" = "work_package_journals"."id"
SQL
+
expect(subject.to_sql).to include <<~SQL.squish
INNER JOIN "time_entries"
ON "time_entries"."entity_type" = 'WorkPackage'