From 796f4d57a10bbc4cd4a580beb58c4f47109322af Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 12 Aug 2016 12:39:30 +0800 Subject: [PATCH] I think this fixes issue #566 but I'm not sure --- app/services/map_export_service.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/services/map_export_service.rb b/app/services/map_export_service.rb index 7c66c0e6..c52b0802 100644 --- a/app/services/map_export_service.rb +++ b/app/services/map_export_service.rb @@ -35,6 +35,7 @@ class MapExportService < Struct.new(:user, :map) .where(mappable: visible_topics, map: map) topic_mappings.map do |mapping| topic = mapping.mappable + next nil if topic.nil? OpenStruct.new( id: topic.id, name: topic.name, @@ -46,12 +47,13 @@ class MapExportService < Struct.new(:user, :map) user: topic.user.name, permission: topic.permission ) - end + end.compact end def exportable_synapses visible_synapses = Pundit.policy_scope!(user, map.synapses) visible_synapses.map do |synapse| + next nil if synapse.nil? OpenStruct.new( topic1: synapse.node1_id, topic2: synapse.node2_id, @@ -60,7 +62,7 @@ class MapExportService < Struct.new(:user, :map) user: synapse.user.name, permission: synapse.permission ) - end + end.compact end def to_spreadsheet