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

Fix rendering permissions of inventory annotations [SCI-2534]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2018-06-28 15:30:32 +02:00
parent 10554fecb4
commit 6660b240c8
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)