diff --git a/app/controllers/super_admin/instance_statuses_controller.rb b/app/controllers/super_admin/instance_statuses_controller.rb index fcecb1c..1379152 100755 --- a/app/controllers/super_admin/instance_statuses_controller.rb +++ b/app/controllers/super_admin/instance_statuses_controller.rb @@ -20,12 +20,12 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController end def instance_meta - context = if ActiveRecord::Base.respond_to?(:connection_pool) - ActiveRecord::Base.connection_pool.migration_context - else - ActiveRecord::Base.connection.migration_context - end - @metrics['Database Migrations'] = context.needs_migration? ? 'pending' : 'completed' + @metrics['Database Migrations'] = begin + ActiveRecord::Base.connection.migration_context.needs_migration? ? 'pending' : 'completed' + rescue StandardError => e + Rails.logger.warn "Migration context check failed: #{e.message}" + 'unknown' + end end def chatwoot_version diff --git a/app/models/inbox.rb b/app/models/inbox.rb index bcef42a..50cb0fa 100755 --- a/app/models/inbox.rb +++ b/app/models/inbox.rb @@ -77,7 +77,6 @@ class Inbox < ApplicationRecord has_one :agent_bot, through: :agent_bot_inbox has_many :webhooks, dependent: :destroy_async has_many :hooks, dependent: :destroy_async, class_name: 'Integrations::Hook' - has_many :inbox_automations, dependent: :destroy_async, class_name: '::Captain::InboxAutomation' # Jasmine has_one :jasmine_inbox_config, class_name: 'Jasmine::InboxConfig', dependent: :destroy diff --git a/config/application.rb b/config/application.rb index 2593ec4..74551d7 100755 --- a/config/application.rb +++ b/config/application.rb @@ -42,8 +42,7 @@ module Chatwoot config.eager_load_paths << Rails.root.join('enterprise/lib') config.eager_load_paths << Rails.root.join('enterprise/listeners') # rubocop:disable Rails/FilePath - enterprise_app_paths = Dir["#{Rails.root}/enterprise/app/*"].reject { |path| %w[views javascript assets].include?(File.basename(path)) } - config.eager_load_paths += enterprise_app_paths + config.eager_load_paths += Dir["#{Rails.root}/enterprise/app/**"] # rubocop:enable Rails/FilePath # Add enterprise views to the view paths config.paths['app/views'].unshift('enterprise/app/views') diff --git a/enterprise/app/models/enterprise/inbox.rb b/enterprise/app/models/enterprise/inbox.rb index 54ef10e..29658ed 100755 --- a/enterprise/app/models/enterprise/inbox.rb +++ b/enterprise/app/models/enterprise/inbox.rb @@ -1,4 +1,6 @@ module Enterprise::Inbox + # member_ids_with_assignment_capacity is used in enterprise to check for agent capacity + def member_ids_with_assignment_capacity return super unless enable_auto_assignment?