Define engine_modules in application config to be managed by external…

… engines
PopulateTools · Sep 10, 2021 · f916dfc · f916dfc
1 parent 42d87e9
commit f916dfc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/gobierto_admin/sites_controller.rb b/app/controllers/gobierto_admin/sites_controller.rb
@@ -115,7 +115,7 @@ def find_site
     end
 
     def get_site_modules
-      APP_CONFIG[:site_modules].map { |site_module| OpenStruct.new(site_module) }
+      APP_CONFIG[:site_modules].union(Rails.configuration.engine_modules).map { |site_module| OpenStruct.new(site_module) }
     end
 
     def set_auth_modules

diff --git a/config/application.rb b/config/application.rb
@@ -74,6 +74,7 @@ class Application < Rails::Application
     config.engine_sass_config_overrides = []
     config.engine_sass_theme_dependencies = []
     config.gobierto_engines_themes = {}
+    config.engine_modules = []
 
     # Custom field plugins
     config.custom_field_plugins = {}

diff --git a/config/initializers/app_config.rb b/config/initializers/app_config.rb
@@ -2,7 +2,7 @@
 
 APP_CONFIG = Rails.application.config_for(:application).with_indifferent_access
 
-SITE_MODULES = APP_CONFIG[:site_modules].map do |site_module|
+SITE_MODULES = APP_CONFIG[:site_modules].union(Rails.configuration.engine_modules).map do |site_module|
   site_module[:namespace]
 end