Merge pull request #2613 from consul/fixup_investments_map

Fix MapLocation json_data to return mappable ids
2018-04-25 21:15:21 +02:00
parent 26f72e437b a44c830cd4
commit f330aea108
2 changed files with 3 additions and 2 deletions
--- a/app/assets/javascripts/map.js.coffee
+++ b/app/assets/javascripts/map.js.coffee
@@ -99,7 +99,7 @@ App.Map =
      for i in addMarkerInvestments
        if App.Map.validCoordinates(i)
          marker = createMarker(i.lat, i.long)
-          marker.options['id'] = i.id
+          marker.options['id'] = i.investment_id

          marker.on 'click', openMarkerPopup

--- a/app/models/map_location.rb
+++ b/app/models/map_location.rb
@@ -11,7 +11,8 @@ class MapLocation < ActiveRecord::Base

  def json_data
    {
-      id: id,
+      investment_id: investment_id,
+      proposal_id: proposal_id,
      lat: latitude,
      long: longitude
    }