From cb0fe049f0aab81db34c401df1e280965110c07b Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Thu, 28 Nov 2019 11:41:08 +0100 Subject: [PATCH] Remove range method from model --- app/models/repository_column.rb | 3 --- .../manage_column_partials/_datetime.html.erb | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/repository_column.rb b/app/models/repository_column.rb index 8f987ca68..9aac91d22 100644 --- a/app/models/repository_column.rb +++ b/app/models/repository_column.rb @@ -67,7 +67,4 @@ class RepositoryColumn < ApplicationRecord Extends::REPOSITORY_IMPORTABLE_TYPES.include?(data_type.to_sym) end - def range? - repository_date_time_range_value? || repository_date_range_value? || repository_time_range_value? - end end diff --git a/app/views/repository_columns/manage_column_partials/_datetime.html.erb b/app/views/repository_columns/manage_column_partials/_datetime.html.erb index 3a6352ece..80cadd7be 100644 --- a/app/views/repository_columns/manage_column_partials/_datetime.html.erb +++ b/app/views/repository_columns/manage_column_partials/_datetime.html.erb @@ -1,8 +1,12 @@ +<% range_type = column&.repository_date_time_range_value? || + column&.repository_date_range_value? || + column&.repository_time_range_value? %> +
- <%= check_box_tag 'range', '', column&.range?, { id: 'datetime-range', class: column.new_record? ? 'simple-checkbox' : 'simple-checkbox disabled' } %> + <%= check_box_tag 'range', '', range_type, { id: 'datetime-range', class: column.new_record? ? 'simple-checkbox' : 'simple-checkbox disabled' } %> Range