From 1385c6964cd8925d402f0e0a1cf2dd3d0cd48fb3 Mon Sep 17 00:00:00 2001 From: Alex Kriuchykhin Date: Tue, 12 Apr 2022 15:56:20 +0200 Subject: [PATCH] Fix sorting by time and time range columns [SCI-6683] (#4011) --- app/models/repository_time_range_value.rb | 2 ++ app/models/repository_time_value.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/repository_time_range_value.rb b/app/models/repository_time_range_value.rb index be07a7bca..22afaaed2 100644 --- a/app/models/repository_time_range_value.rb +++ b/app/models/repository_time_range_value.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class RepositoryTimeRangeValue < RepositoryDateTimeRangeValueBase + SORTABLE_COLUMN_NAME = 'repository_date_time_range_values.start_time::time' + def data_different?(new_data) data = new_data.is_a?(String) ? JSON.parse(new_data).symbolize_keys : new_data diff --git a/app/models/repository_time_value.rb b/app/models/repository_time_value.rb index eff2c232a..1c0bed1c5 100644 --- a/app/models/repository_time_value.rb +++ b/app/models/repository_time_value.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class RepositoryTimeValue < RepositoryDateTimeValueBase + SORTABLE_COLUMN_NAME = 'repository_date_time_values.data::time' + def data_different?(new_data) new_time = Time.zone.parse(new_data) new_time.min != data.min || new_time.hour != data.hour