From 777784b20c099c3a97a4eec74cfabaf2f7cf31e9 Mon Sep 17 00:00:00 2001 From: Angel Aviel Domaoan Date: Wed, 2 Mar 2022 10:00:38 +0800 Subject: [PATCH] Fix years --- app/components/document_advanced_search_component.rb | 4 ++-- app/controllers/api/jurisprudences_controller.rb | 4 ++-- app/controllers/decisions_controller.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/components/document_advanced_search_component.rb b/app/components/document_advanced_search_component.rb index d98e78f..7bfb99a 100644 --- a/app/components/document_advanced_search_component.rb +++ b/app/components/document_advanced_search_component.rb @@ -6,8 +6,8 @@ class DocumentAdvancedSearchComponent < BaseComponent end def years - start_year = Cdao::Jurisprudence.order(year: :asc).first(10).compact.map(&:year).uniq.first || "1900" - end_year = Cdao::Jurisprudence.order(year: :desc).last(10).compact.map(&:year).uniq.last || Time.zone.today.year + start_year = Cdao::Jurisprudence.order(year: :asc).first(10).map(&:year).compact.uniq.first || "1900" + end_year = Cdao::Jurisprudence.order(year: :desc).last(10).map(&:year).compact.uniq.last || Time.zone.today.year (start_year..end_year).entries.reverse end end diff --git a/app/controllers/api/jurisprudences_controller.rb b/app/controllers/api/jurisprudences_controller.rb index 2ee8162..1e51a8d 100644 --- a/app/controllers/api/jurisprudences_controller.rb +++ b/app/controllers/api/jurisprudences_controller.rb @@ -19,8 +19,8 @@ module Api def years authorize! :index, Cdao::Jurisprudence - start_year = Cdao::Jurisprudence.order(year: :asc).first(10).compact.map(&:year).uniq.first || "1900" - end_year = Cdao::Jurisprudence.order(year: :desc).last(10).compact.map(&:year).uniq.last || Time.zone.today.year + start_year = Cdao::Jurisprudence.order(year: :asc).first(10).map(&:year).compact.uniq.first || "1900" + end_year = Cdao::Jurisprudence.order(year: :desc).last(10).map(&:year).compact.uniq.last || Time.zone.today.year @years = (start_year..end_year).entries.reverse respond_with @years diff --git a/app/controllers/decisions_controller.rb b/app/controllers/decisions_controller.rb index b6db915..0f86e13 100644 --- a/app/controllers/decisions_controller.rb +++ b/app/controllers/decisions_controller.rb @@ -10,8 +10,8 @@ class DecisionsController < ApplicationController @jurisprudences = search.results - start_year = Cdao::Jurisprudence.order(year: :asc).first(10).compact.map(&:year).uniq.first || "1900" - end_year = Cdao::Jurisprudence.order(year: :desc).last(10).compact.map(&:year).uniq.last || Time.zone.today.year + start_year = Cdao::Jurisprudence.order(year: :asc).first(10).map(&:year).compact.uniq.first || "1900" + end_year = Cdao::Jurisprudence.order(year: :desc).last(10).map(&:year).compact.uniq.last || Time.zone.today.year @years = (start_year..end_year).entries.reverse respond_to do |format|