diff --git a/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb b/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb index 687da55bd..e02c090db 100644 --- a/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb +++ b/app/controllers/api/v1/accounts/custom_attribute_definitions_controller.rb @@ -31,12 +31,13 @@ class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Account end def fetch_custom_attribute_definition - @custom_attribute_definition = @custom_attribute_definitions.find(permitted_params[:id]) + @custom_attribute_definition = Current.account.custom_attribute_definitions.find(permitted_params[:id]) end def permitted_payload params.require(:custom_attribute_definition).permit( :attribute_display_name, + :attribute_description, :attribute_display_type, :attribute_key, :attribute_model, @@ -45,6 +46,6 @@ class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Account end def permitted_params - params.permit(:id, :filter_type) + params.permit(:id, :filter_type, :attribute_model) end end diff --git a/app/views/api/v1/models/_custom_attribute_definition.json.jbuilder b/app/views/api/v1/models/_custom_attribute_definition.json.jbuilder index e26c65bf2..b715b0e50 100644 --- a/app/views/api/v1/models/_custom_attribute_definition.json.jbuilder +++ b/app/views/api/v1/models/_custom_attribute_definition.json.jbuilder @@ -1,5 +1,7 @@ +json.id resource.id json.attribute_display_name resource.attribute_display_name json.attribute_display_type resource.attribute_display_type +json.attribute_description resource.attribute_description json.attribute_key resource.attribute_key json.attribute_model resource.attribute_model json.default_value resource.default_value