scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1136 from okriuchykhin/ok_SCI_2396

Browse source 
Handle situation with smart annotations and zero inventories [SCI-2396]
This commit is contained in:
okriuchykhin 2018-05-28 17:23:29 +02:00 committed by GitHub
parent cc5b4b75cc addf4cfe5e
commit 6deaa7235b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/at_who_controller.rb
View file

@ -30,13 +30,18 @@ class AtWhoController < ApplicationController
end end
def rep_items def rep_items
res = SmartAnnotation.new(current_user, current_team, @query)
repository = Repository.find_by_id(params[:repository_id]) repository = Repository.find_by_id(params[:repository_id])
render_403 && return unless repository && can_read_team?(repository.team) items =
if repository && can_read_team?(repository.team)
SmartAnnotation.new(current_user, current_team, @query)
.repository_rows(repository)
else
[]
end
respond_to do |format| respond_to do |format|
format.json do format.json do
render json: { render json: {
res: res.repository_rows(repository), res: items,
status: :ok status: :ok
} }
end end