From b6e2d40be50c136c0ee61dec9f573d8635be4a75 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson <alexander.olofsson@liu.se> Date: Thu, 20 Feb 2025 16:21:56 +0100 Subject: [PATCH] Improve Foreman 3.13 support --- app/helpers/cmdb_helper.rb | 2 +- config/initializers/inflections.rb | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/helpers/cmdb_helper.rb b/app/helpers/cmdb_helper.rb index ef4614e..2edcaeb 100644 --- a/app/helpers/cmdb_helper.rb +++ b/app/helpers/cmdb_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Helpers for rendering overridable CMDB data -module CmdbHelper +module CMDBHelper def cmdb_text_f(f, facet, ephemeral_attr, **options) unless options.key? :disabled options[:disabled] = !facet.ephemeral_attributes.dig(*ephemeral_attr.split(".").map(&:to_sym))&.present? diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 25acb99..5737638 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,11 +1,5 @@ # frozen_string_literal: true -Rails.autoloaders.each do |autoloader| - autoloader.inflector.inflect( - "cmdb_status" => "CMDBStatus", - "foreman_liudesk_cmdb" => "ForemanLiudeskCMDB", - "liudesk_cmdb" => "LiudeskCMDB", - "liudesk_cmdb_facet" => "LiudeskCMDBFacet", - "liudesk_cmdb_hostgroup_facet" => "LiudeskCMDBHostgroupFacet" - ) +ActiveSupport::Inflector.inflections do |inflect| + inflect.acronym 'CMDB' end -- GitLab