PopulateTools · entantoencuanto · Sep 9, 2021 · Sep 10, 2021 · Nov 17, 2021
diff --git a/app/controllers/gobierto_admin/gobierto_dashboards/dashboards_controller.rb b/app/controllers/gobierto_admin/gobierto_dashboards/dashboards_controller.rb
diff --git a/app/controllers/gobierto_admin/gobierto_plans/projects_controller.rb b/app/controllers/gobierto_admin/gobierto_plans/projects_controller.rb
@@ -200,7 +200,7 @@ def find_versioned_project
       end
 
       def set_dashboards_list_path
-        return unless current_site.configuration.gobierto_dashboards_enabled? &&
+        return unless current_site.configuration.available_module?("GobiertoDashboards") &&
                       current_admin.module_allowed_action?(current_admin_module, current_site, :manage_dashboards)
 
         @dashboards_list_path ||= list_admin_plans_plan_dashboards_path(@plan)

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/app/controllers/gobierto_dashboards/api/v1/base_controller.rb b/app/controllers/gobierto_dashboards/api/v1/base_controller.rb
diff --git a/app/controllers/gobierto_dashboards/api/v1/dashboards_controller.rb b/app/controllers/gobierto_dashboards/api/v1/dashboards_controller.rb
diff --git a/app/controllers/gobierto_plans/plan_types_controller.rb b/app/controllers/gobierto_plans/plan_types_controller.rb
@@ -42,7 +42,7 @@ def sdg
     private
 
     def dashboards_enabled?
-      @dashboards_enabled ||= module_enabled?("GobiertoDashboards") && current_site.dashboards.active.for_context(@plan).exists?
+      @dashboards_enabled ||= module_enabled?("GobiertoDashboards") && defined?(GobiertoDashboards::Dashboard) && current_site.dashboards.active.for_context(@plan).exists?
     end
 
     def find_plan_type

diff --git a/app/forms/gobierto_dashboards/dashboard_form.rb b/app/forms/gobierto_dashboards/dashboard_form.rb
diff --git a/app/models/gobierto_dashboards/dashboard.rb b/app/models/gobierto_dashboards/dashboard.rb
diff --git a/app/models/gobierto_dashboards/data_pipes/base.rb b/app/models/gobierto_dashboards/data_pipes/base.rb