scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-11 06:35:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1225 from okriuchykhin/ok_SCI_2534

Browse source 
Fix rendering permissions of inventory annotations [SCI-2534]
This commit is contained in:
Luka Murn 2018-07-13 15:18:59 +02:00 • committed by GitHub
commit f67b8d05c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/services/smart_annotations/tag_to_html.rb
View file

@ -41,7 +41,8 @@ module SmartAnnotations
end
def repository_item(name, user, type, object)
if object && SmartAnnotations::PermissionEval.check(user, type, object)
if object
return unless SmartAnnotations::PermissionEval.check(user, type, object)
return SmartAnnotations::HtmlPreview.html(nil, type, object)
end
SmartAnnotations::HtmlPreview.html(name, type, object)

3
app/services/smart_annotations/tag_to_text.rb
View file

@ -53,7 +53,8 @@ module SmartAnnotations
end
def repository_item(name, user, type, object)
if object && SmartAnnotations::PermissionEval.check(user, type, object)
if object
return unless SmartAnnotations::PermissionEval.check(user, type, object)
return SmartAnnotations::TextPreview.text(nil, type, object)
end
SmartAnnotations::TextPreview.text(name, type, object)