scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-06 13:14:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed hound

Browse source
This commit is contained in:
Zanz2 2018-09-10 15:39:50 +02:00
parent bd49ea56c5
commit 8a925008f9
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/serializers/api/v1/result_serializer.rb
View file

@ -6,7 +6,8 @@ module Api
type :results
attributes :id, :name, :my_module_id, :user_id, :created_at, :updated_at,
:archived, :archived_on, :last_modified_by_id, :archived_by_id,
:restored_by_id, :restored_on, :result_text, :result_table, :result_asset
:restored_by_id, :restored_on, :result_text, :result_table,
:result_asset
belongs_to :my_module, serializer: MyModuleSerializer
end

3
config/routes.rb
View file

@ -598,13 +598,10 @@ Rails.application.routes.draw do
end
end
end
<<<<<<< HEAD
resources :users, only: %i(show) do
resources :user_identities,
only: %i(index create show update destroy)
end
=======
>>>>>>> Added results endpoint
end
end
end