LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Allow resource access without filter type in custom_filters API (#11445)

Browse Source 
The custom filters API previously required a filter_type attribute, even
when accessing a resource by its ID, which isn’t necessary. This PR
removes that condition.

Fixes https://github.com/chatwoot/chatwoot/issues/11384
This commit is contained in:
Pranav
2025-05-08 20:12:05 -07:00
committed by GitHub
parent 27430752b5
commit a57dfe4478
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/api/v1/accounts/custom_filters_controller.rb
View File

@@ -1,6 +1,6 @@
class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
before_action :check_authorization before_action :check_authorization
before_action :fetch_custom_filters, except: [:create] before_action :fetch_custom_filters, only: [:index]
before_action :fetch_custom_filter, only: [:show, :update, :destroy] before_action :fetch_custom_filter, only: [:show, :update, :destroy]
DEFAULT_FILTER_TYPE = 'conversation'.freeze DEFAULT_FILTER_TYPE = 'conversation'.freeze
@@ -9,8 +9,8 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
def show; end def show; end
def create def create
@custom_filter = current_user.custom_filters.create!( @custom_filter = Current.account.custom_filters.create!(
permitted_payload.merge(account_id: Current.account.id) permitted_payload.merge(user: Current.user)
) )
render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid? render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
end end
@@ -27,14 +27,16 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
private private
def fetch_custom_filters def fetch_custom_filters
@custom_filters = current_user.custom_filters.where( @custom_filters = Current.account.custom_filters.where(
account_id: Current.account.id, user: Current.user,
filter_type: permitted_params[:filter_type] || DEFAULT_FILTER_TYPE filter_type: permitted_params[:filter_type] || DEFAULT_FILTER_TYPE
) )
end end
def fetch_custom_filter def fetch_custom_filter
@custom_filter = @custom_filters.find(permitted_params[:id]) @custom_filter = Current.account.custom_filters.where(
user: Current.user
).find(permitted_params[:id])
end end
def permitted_payload def permitted_payload