diff --git a/app/models/ticket/article/assets.rb b/app/models/ticket/article/assets.rb index 78848ef28..9a6cc9dd1 100644 --- a/app/models/ticket/article/assets.rb +++ b/app/models/ticket/article/assets.rb @@ -33,7 +33,9 @@ returns end if !data[ app_model_ticket ][ ticket_id ] ticket = Ticket.lookup(id: ticket_id) - data = ticket.assets(data) + if ticket + data = ticket.assets(data) + end end if !data[ app_model_article ] diff --git a/app/models/user/assets.rb b/app/models/user/assets.rb index 706b609c6..f7436c7c2 100644 --- a/app/models/user/assets.rb +++ b/app/models/user/assets.rb @@ -61,6 +61,8 @@ returns next if data[:Role] && data[:Role][role_id] role = Role.lookup(id: role_id) + next if !role + data = role.assets(data) end