Merge pull request #14680 from opf/feature/52252-remove-derived-remai…

…ning-work-from-work-package-form-configuration [52252] Exclude derived_remaining_time from work package form
opf · Feb 1, 2024 · 4ca30e8 · 4ca30e8
2 parents 020e38b + 3565c08
commit 4ca30e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/models/type/attributes.rb b/app/models/type/attributes.rb
@@ -35,6 +35,7 @@ module Type::Attributes
                 derived_start_date
                 derived_due_date
                 derived_estimated_time
+                derived_remaining_time
                 ignore_non_working_days
                 duration
                 description
@@ -80,6 +81,7 @@ def all_work_package_form_attributes(merge_date: false)
 
       OpenProject::Cache.fetch('all_work_package_form_attributes',
                                *wp_cf_cache_parts,
+                               EXCLUDED.length,
                                merge_date) do
         calculate_all_work_package_form_attributes(merge_date)
       end

diff --git a/spec/features/work_packages/share/access_spec.rb b/spec/features/work_packages/share/access_spec.rb
@@ -100,7 +100,7 @@
       %i[type subject description
          assignee responsible
          estimatedTime remainingTime
-         combinedDate percentageDone category version derivedRemainingTime
+         combinedDate percentageDone category version
          overallCosts laborCosts].each do |field|
         work_package_page.edit_field(field).expect_read_only
       end
@@ -174,7 +174,7 @@
       %i[type subject description
          assignee responsible
          estimatedTime remainingTime
-         combinedDate percentageDone category version derivedRemainingTime
+         combinedDate percentageDone category version
          overallCosts laborCosts].each do |field|
         work_package_page.edit_field(field).expect_read_only
       end
@@ -258,7 +258,7 @@
           .to be_editable
       end
       # Except for
-      %i[version derivedRemainingTime
+      %i[version
          overallCosts laborCosts].each do |field|
         work_package_page.edit_field(field).expect_read_only
       end