remove samples from smart annotations

This commit is contained in:
zmagod 2018-04-03 09:43:12 +02:00
parent 01a548e8b3
commit 7dfec94ffc
3 changed files with 3 additions and 18 deletions

View file

@ -23,10 +23,6 @@ module SmartAnnotations
can_read_experiment?(user, object.experiment)
end
def validate_sam_permissions(user, object)
can_read_team?(user, object.team)
end
def validate_rep_item_permissions(user, object)
can_read_team?(user, object.repository.team)
end

View file

@ -43,16 +43,6 @@ module SmartAnnotations
"#{object.name}</a>"
end
def generate_sam_snippet(name, object)
if object
return "<span class='glyphicon glyphicon-tint'></span>" \
"<a href='#{ROUTES.sample_path(object.id)}' " \
"class='sample-info-link'>#{object.name}</a>"
end
"<span class='glyphicon glyphicon-tint'></span>" \
"#{name} #{I18n.t('atwho.res.deleted')}"
end
def generate_rep_item_snippet(name, object)
if object
repository_name = object.repository.name

View file

@ -13,11 +13,10 @@ module SmartAnnotations
private
REGEX = /\[\#(.*?)~(prj|exp|tsk|sam|rep_item)~([0-9a-zA-Z]+)\]/
REGEX = /\[\#(.*?)~(prj|exp|tsk|rep_item)~([0-9a-zA-Z]+)\]/
OBJECT_MAPPINGS = { prj: Project,
exp: Experiment,
tsk: MyModule,
sam: Sample,
rep_item: RepositoryRow }.freeze
def parse(user, text)
@ -26,8 +25,8 @@ module SmartAnnotations
type = value[:object_type]
begin
object = fetch_object(type, value[:object_id])
# handle samples/repository_items edge case
if type.in? %w(sam rep_item)
# handle repository_items edge case
if type == 'rep_item'
sample_or_repository_item(value[:name], user, type, object)
else
next unless object && SmartAnnotations::PermissionEval.check(user,