Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved error handling.

Browse source
This commit is contained in:
Martin Edenhofer 2018-05-08 11:50:11 +02:00
parent 57c1124a42
commit 45c4488b7d
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/app/controllers/ticket_zoom/sidebar_article_attachments.coffee
View file

@ -13,15 +13,16 @@ class SidebarArticleAttachments extends App.Controller
showObjects: (el) => showObjects: (el) =>
@el = el @el = el
if !@ticket || _.isEmpty(@ticket.article_ids) if _.isEmpty(@ticket) || _.isEmpty(@ticket.article_ids)
@el.html("<div>#{App.i18n.translateInline('none')}</div>") @el.html("<div>#{App.i18n.translateInline('none')}</div>")
return return
html = '' html = ''
for ticket_article_id, index in @ticket.article_ids for ticket_article_id, index in @ticket.article_ids
article = App.TicketArticle.find(ticket_article_id) if App.TicketArticle.exists(ticket_article_id)
attachments = App.TicketArticle.contentAttachments(article) article = App.TicketArticle.find(ticket_article_id)
if !_.isEmpty(attachments) attachments = App.TicketArticle.contentAttachments(article)
html = App.view('ticket_zoom/sidebar_article_attachment')(article: article, attachments: attachments) + html if !_.isEmpty(attachments)
html = App.view('ticket_zoom/sidebar_article_attachment')(article: article, attachments: attachments) + html
@el.html(html) @el.html(html)
@el.delegate('.js-attachments img', 'click', (e) => @el.delegate('.js-attachments img', 'click', (e) =>
@imageView(e) @imageView(e)

1
app/assets/javascripts/app/models/ticket_article.coffee
View file

@ -49,6 +49,7 @@ class App.TicketArticle extends App.Model
return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model." return "Unknow action for (#{@objectDisplayName()}/#{item.type}), extend activityMessage() of model."
@contentAttachments: (article) -> @contentAttachments: (article) ->
return [] if !article
return [] if !article.attachments return [] if !article.attachments
attachments = [] attachments = []
for attachment in article.attachments for attachment in article.attachments

2
app/models/organization/assets.rb
View file

@ -47,7 +47,7 @@ returns
local_attributes['member_ids'] = local_attributes['member_ids'].sort[0, 100] local_attributes['member_ids'] = local_attributes['member_ids'].sort[0, 100]
end end
local_attributes['member_ids'].each do |local_user_id| local_attributes['member_ids'].each do |local_user_id|
next if data[ app_model_user ][ local_user_id ] next if data[ app_model_user ] && data[ app_model_user ][ local_user_id ]
user = User.lookup(id: local_user_id) user = User.lookup(id: local_user_id)
next if !user next if !user
data = user.assets(data) data = user.assets(data)