From f350a9d150479902fa000248f85edc2cdf4c1fc4 Mon Sep 17 00:00:00 2001 From: Fabien LEFEBVRE Date: Mon, 18 Oct 2021 15:18:19 +0200 Subject: [PATCH 1/2] Fix active_admin option not working with auto annotate models task --- lib/tasks/annotate_models.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/annotate_models.rake b/lib/tasks/annotate_models.rake index 448fa80b..ef78c3fd 100644 --- a/lib/tasks/annotate_models.rake +++ b/lib/tasks/annotate_models.rake @@ -12,6 +12,7 @@ task annotate_models: :environment do options = {is_rake: true} ENV['position'] = options[:position] = Annotate::Helpers.fallback(ENV['position'], 'before') + options[:active_admin] = ENV.fetch('active_admin', 'false') options[:additional_file_patterns] = ENV['additional_file_patterns'] ? ENV['additional_file_patterns'].split(',') : [] options[:position_in_class] = Annotate::Helpers.fallback(ENV['position_in_class'], ENV['position']) options[:position_in_fixture] = Annotate::Helpers.fallback(ENV['position_in_fixture'], ENV['position']) From 2286b490df0f1de423fd74b4e66757b5cf010cc1 Mon Sep 17 00:00:00 2001 From: "Fabien LEFEBVRE (d1ceward)" Date: Wed, 20 Sep 2023 13:36:32 +0200 Subject: [PATCH 2/2] Using true? helpers to enable other forms of truth for active_admin option --- lib/tasks/annotate_models.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/annotate_models.rake b/lib/tasks/annotate_models.rake index ef78c3fd..da38f03e 100644 --- a/lib/tasks/annotate_models.rake +++ b/lib/tasks/annotate_models.rake @@ -12,7 +12,7 @@ task annotate_models: :environment do options = {is_rake: true} ENV['position'] = options[:position] = Annotate::Helpers.fallback(ENV['position'], 'before') - options[:active_admin] = ENV.fetch('active_admin', 'false') + options[:active_admin] = Annotate::Helpers.true?(ENV['active_admin']) options[:additional_file_patterns] = ENV['additional_file_patterns'] ? ENV['additional_file_patterns'].split(',') : [] options[:position_in_class] = Annotate::Helpers.fallback(ENV['position_in_class'], ENV['position']) options[:position_in_fixture] = Annotate::Helpers.fallback(ENV['position_in_fixture'], ENV['position'])