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

revert changes to delete logic

Klaus Zanders85e30b5f06a5
diff --git a/app/models/work_package.rb b/app/models/work_package.rb
index 2c42ad940cd..f7dba16408f 100644
--- a/app/models/work_package.rb
+++ b/app/models/work_package.rb
@@ -59,10 +59,8 @@ class WorkPackage < ApplicationRecord
belongs_to :priority, class_name: "IssuePriority"
belongs_to :category, class_name: "Category", optional: true
- has_many :time_entries, dependent: :destroy, as: :entity
-
+ has_many :time_entries, dependent: :delete_all, inverse_of: :entity
has_many :file_links, dependent: :delete_all, class_name: "Storages::FileLink", as: :container
-
has_many :storages, through: :project
has_and_belongs_to_many :changesets, -> { # rubocop:disable Rails/HasAndBelongsToMany
@@ -243,10 +241,7 @@ class WorkPackage < ApplicationRecord
end
def add_time_entry(attributes = {})
- attributes.reverse_merge!(
- project:,
- work_package: self
- )
+ attributes.reverse_merge!(project:, entity: self)
time_entries.build(attributes)
end
@@ -269,7 +264,7 @@ class WorkPackage < ApplicationRecord
end
def to_s
- "#{type.is_standard ? '' : type.name} ##{id}: #{subject}"
+ "#{type.name unless type.is_standard} ##{id}: #{subject}"
end
# Return true if the work_package is closed, otherwise false
diff --git a/app/models/work_packages/costs.rb b/app/models/work_packages/costs.rb
index 7116126681f..2ac797d5903 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: :destroy, inverse_of: :entity
+ has_many :cost_entries, dependent: :delete_all, inverse_of: :entity
# disabled for now, implements part of ticket blocking
validate :validate_budget