[pull] dev from opf:dev

Gemfile.lock

@@ -386,7 +386,7 @@ GEM
     brakeman (6.1.2)
       racc
     browser (6.0.0)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
       addressable
@@ -775,7 +775,7 @@ GEM
       actionview
       openproject-octicons (= 19.14.0)
       railties
-    openproject-primer_view_components (0.33.1)
+    openproject-primer_view_components (0.33.2)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.12.0)

app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.sass

@@ -6,3 +6,8 @@
     &:before
       @include icon-font-common
       margin-right: 10px
+
+.FormControl-horizontalGroup
+    display: flex
+    align-items: center
+    justify-content: space-between

app/controllers/work_packages/progress_controller.rb

@@ -130,17 +130,7 @@ def extract_persisted_progress_attributes
 
   def work_package_params
     params.require(:work_package)
-          .permit(allowed_params).tap do |wp_params|
-      %w[estimated_hours remaining_hours].each do |attr|
-        if wp_params[attr].present?
-          begin
-            wp_params[attr] = DurationConverter.parse(wp_params[attr])
-          rescue ChronicDuration::DurationParseError
-            @work_package.errors.add(attr.to_sym, :invalid)
-          end
-        end
-      end
-    end
+          .permit(allowed_params)
   end
 
   def allowed_params

app/helpers/omniauth_helper.rb

@@ -42,6 +42,6 @@ def omniauth_direct_login?
   # If this option is active /login will lead directly to the configured omniauth provider
   # and so will a click on 'Sign in' (as opposed to opening the drop down menu).
   def direct_login_provider
-    OpenProject::Configuration["omniauth_direct_login_provider"]
+    Setting.omniauth_direct_login_provider
   end
 end

app/models/work_package.rb

@@ -315,13 +315,11 @@ def hide_attachments?
   end
 
   def estimated_hours=(hours)
-    converted_hours = (hours.is_a?(String) ? hours.to_hours : hours)
-    write_attribute :estimated_hours, !!converted_hours ? converted_hours : hours
+    write_attribute :estimated_hours, convert_duration_to_hours(hours)
   end
 
   def remaining_hours=(hours)
-    converted_hours = (hours.is_a?(String) ? hours.to_hours : hours)
-    write_attribute :remaining_hours, !!converted_hours ? converted_hours : hours
+    write_attribute :remaining_hours, convert_duration_to_hours(hours)
   end
 
   def duration_in_hours
@@ -546,6 +544,17 @@ def add_time_entry_for(user, attributes)
     time_entries.build(attributes)
   end
 
+  def convert_duration_to_hours(value)
+    if value.is_a?(String)
+      begin
+        value = value.blank? ? nil : DurationConverter.parse(value)
+      rescue ChronicDuration::DurationParseError
+        # keep invalid value, error shall be caught by numericality validator
+      end
+    end
+    value
+  end
+
   ##
   # Checks if the time entry defined by the given attributes is blank.
   # A time entry counts as blank despite a selected activity if that activity

app/seeders/development_data/projects_seeder.rb

@@ -47,7 +47,13 @@ def seed_data!
     end
 
     def applicable?
-      Project.where(identifier: project_identifiers).count == 0
+      recent_installation? && Project.where(identifier: project_identifiers).count == 0
+    end
+
+    # returns true if no projects have been created more than 1 hour ago,
+    # meaning this is a recent installation
+    def recent_installation?
+      Project.where(created_at: ..1.hour.ago).none?
     end
 
     def project_identifiers

config/locales/crowdin/af.yml

@@ -1039,11 +1039,13 @@ af:
               only_same_project_categories_allowed: "Die katagorie van 'n werkspakket moet binne in dieselfde projek wees as die werkspakket."
               does_not_exist: "Die spesefieke kategorie bestaan nie."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"

config/locales/crowdin/ar.yml

@@ -1067,11 +1067,13 @@ ar:
               only_same_project_categories_allowed: "يجب أن يكون فئة مجموعة العمل ضمن نفس المشروع كمجموعة عمل."
               does_not_exist: "الفئة المحددة غير موجودة."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"

config/locales/crowdin/az.yml

@@ -1039,11 +1039,13 @@ az:
               only_same_project_categories_allowed: "The category of a work package must be within the same project as the work package."
               does_not_exist: "The specified category does not exist."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"

config/locales/crowdin/be.yml

@@ -1053,11 +1053,13 @@ be:
               only_same_project_categories_allowed: "The category of a work package must be within the same project as the work package."
               does_not_exist: "The specified category does not exist."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"

config/locales/crowdin/bg.yml

@@ -1039,11 +1039,13 @@ bg:
               only_same_project_categories_allowed: "Категорията на работен пакет трябва да бъде в същия проект като работния пакет."
               does_not_exist: "Определената категория не съществува."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"

config/locales/crowdin/ca.yml

@@ -1035,11 +1035,13 @@ ca:
               only_same_project_categories_allowed: "La categoria d'un paquet de treball ha d'estar al mateix projecte que el paquet de treball."
               does_not_exist: "La categoria especificada no existeix."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "No pot ser inferior al treball restant."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"

config/locales/crowdin/ckb-IR.yml

@@ -1039,11 +1039,13 @@ ckb-IR:
               only_same_project_categories_allowed: "The category of a work package must be within the same project as the work package."
               does_not_exist: "The specified category does not exist."
             estimated_hours:
+              not_a_number: "is not a valid duration."
               cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
               must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
               only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
               format: "%{message}"
             remaining_hours:
+              not_a_number: "is not a valid duration."
               cant_exceed_work: "Cannot be higher than Work."
               must_be_set_when_work_is_set: "Required when Work is set."
               format: "%{message}"