scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2501 from aignatov-bio/ai-sci-4474-add-decimals-to-repository-api

Browse source 
Add decimals to repository column API [SCI-4474]
This commit is contained in:
Alex Kriuchykhin 2020-04-03 11:45:55 +02:00 committed by GitHub
parent f313b6ff01 af02201b43
commit 3e20efcc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/api/v1/inventory_columns_controller.rb
View file

@ -56,9 +56,7 @@ module Api
private
def check_manage_permissions
unless can_manage_repository_column?(@inventory_column)
raise PermissionError.new(RepositoryColumn, :manage)
end
raise PermissionError.new(RepositoryColumn, :manage) unless can_manage_repository_column?(@inventory_column)
end
def check_create_permissions
@ -66,12 +64,11 @@ module Api
end
def inventory_column_params
unless params.require(:data).require(:type) == 'inventory_columns'
raise TypeError
end
raise TypeError unless params.require(:data).require(:type) == 'inventory_columns'
params.require(:data).require(:attributes)
new_params = params
.permit(data: { attributes: %i(name data_type) })[:data]
.permit(data: { attributes: [:name, :data_type, metadata: {}] })[:data]
.merge(created_by: @current_user)
if new_params[:attributes][:data_type].present?
new_params[:attributes][:data_type] =
@ -82,9 +79,8 @@ module Api
end
def update_inventory_column_params
unless params.require(:data).require(:id).to_i == params[:id].to_i
raise IDMismatchError
end
raise IDMismatchError unless params.require(:data).require(:id).to_i == params[:id].to_i
if inventory_column_params[:attributes].include?(:data_type)
raise ActiveRecord::RecordInvalid,
I18n.t('api.core.errors.inventory_column_type.detail')

2
app/serializers/api/v1/inventory_column_serializer.rb
View file

@ -4,7 +4,7 @@ module Api
module V1
class InventoryColumnSerializer < ActiveModel::Serializer
type :inventory_columns
attributes :name, :data_type
attributes :name, :data_type, :metadata
has_many :repository_list_items,
key: :inventory_list_items,
serializer: InventoryListItemSerializer,