From c91a497650a00128d0083a1535c96887db7c1832 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 8 Feb 2016 23:05:59 +0100 Subject: [PATCH] Improved error handling. --- app/models/application_model/assets.rb | 5 +++-- app/models/channel/assets.rb | 5 +++-- app/models/history/assets.rb | 6 ++++-- app/models/organization/assets.rb | 13 +++++++------ app/models/ticket/article/assets.rb | 5 +++-- app/models/ticket/assets.rb | 5 +++-- app/models/user/assets.rb | 5 +++-- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/models/application_model/assets.rb b/app/models/application_model/assets.rb index c7f96114b..92b56d474 100644 --- a/app/models/application_model/assets.rb +++ b/app/models/application_model/assets.rb @@ -32,8 +32,9 @@ returns %w(created_by_id updated_by_id).each {|local_user_id| next if !self[ local_user_id ] next if data[ User.to_app_model ] && data[ User.to_app_model ][ self[ local_user_id ] ] - user = User.lookup( id: self[ local_user_id ] ) - data = user.assets( data ) + user = User.lookup(id: self[ local_user_id ]) + next if !user + data = user.assets(data) } data end diff --git a/app/models/channel/assets.rb b/app/models/channel/assets.rb index be662ce9a..e0e321000 100644 --- a/app/models/channel/assets.rb +++ b/app/models/channel/assets.rb @@ -52,8 +52,9 @@ returns %w(created_by_id updated_by_id).each {|local_user_id| next if !self[ local_user_id ] next if data[ User.to_app_model ] && data[ User.to_app_model ][ self[ local_user_id ] ] - user = User.lookup( id: self[ local_user_id ] ) - data = user.assets( data ) + user = User.lookup(id: self[ local_user_id ]) + next if !user + data = user.assets(data) } data end diff --git a/app/models/history/assets.rb b/app/models/history/assets.rb index 58c7e2c5c..fbbdda635 100644 --- a/app/models/history/assets.rb +++ b/app/models/history/assets.rb @@ -24,8 +24,10 @@ returns def assets (data) if !data[ User.to_app_model ] || !data[ User.to_app_model ][ self['created_by_id'] ] - user = User.lookup( id: self['created_by_id'] ) - data = user.assets( data ) + user = User.lookup(id: self['created_by_id']) + if user + data = user.assets(data) + end end data diff --git a/app/models/organization/assets.rb b/app/models/organization/assets.rb index 2403f8b5c..383d50ab7 100644 --- a/app/models/organization/assets.rb +++ b/app/models/organization/assets.rb @@ -46,10 +46,10 @@ returns local_attributes['member_ids'] = local_member_ids if local_member_ids local_member_ids.each {|local_user_id| - if !data[ User.to_app_model ][ local_user_id ] - user = User.lookup( id: local_user_id ) - data = user.assets( data ) - end + next if data[ User.to_app_model ][ local_user_id ] + user = User.lookup(id: local_user_id) + next if !user + data = user.assets(data) } end @@ -58,8 +58,9 @@ returns %w(created_by_id updated_by_id).each {|local_user_id| next if !self[ local_user_id ] next if data[ User.to_app_model ][ self[ local_user_id ] ] - user = User.lookup( id: self[ local_user_id ] ) - data = user.assets( data ) + user = User.lookup(id: self[ local_user_id ]) + next if !user + data = user.assets(data) } data end diff --git a/app/models/ticket/article/assets.rb b/app/models/ticket/article/assets.rb index e3dcf8807..8642d3d9c 100644 --- a/app/models/ticket/article/assets.rb +++ b/app/models/ticket/article/assets.rb @@ -44,8 +44,9 @@ returns %w(created_by_id updated_by_id).each {|local_user_id| next if !self[ local_user_id ] next if data[ User.to_app_model ] && data[ User.to_app_model ][ self[ local_user_id ] ] - user = User.lookup( id: self[ local_user_id ] ) - data = user.assets( data ) + user = User.lookup(id: self[ local_user_id ]) + next if !user + data = user.assets(data) } data end diff --git a/app/models/ticket/assets.rb b/app/models/ticket/assets.rb index 5a75f2117..65b5c5f76 100644 --- a/app/models/ticket/assets.rb +++ b/app/models/ticket/assets.rb @@ -31,8 +31,9 @@ returns %w(created_by_id updated_by_id owner_id customer_id).each {|local_user_id| next if !self[ local_user_id ] next if data[ User.to_app_model ] && data[ User.to_app_model ][ self[ local_user_id ] ] - user = User.lookup( id: self[ local_user_id ] ) - data = user.assets( data ) + user = User.lookup(id: self[ local_user_id ]) + next if !user + data = user.assets(data) } data end diff --git a/app/models/user/assets.rb b/app/models/user/assets.rb index 05c8ab8d7..75b07b8a8 100644 --- a/app/models/user/assets.rb +++ b/app/models/user/assets.rb @@ -111,8 +111,9 @@ returns %w(created_by_id updated_by_id).each {|local_user_id| next if !self[ local_user_id ] next if data[ User.to_app_model ][ self[ local_user_id ] ] - user = User.lookup( id: self[ local_user_id ] ) - data = user.assets( data ) + user = User.lookup(id: self[ local_user_id ]) + next if !user + data = user.assets(data) } data end