From 53bc4ee1c8f02b38cc2d5fffe50982d9d30c20cf Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 28 Jan 2017 15:44:38 -0500 Subject: [PATCH] fix mapper page (#1050) --- app/views/explore/mapper.html.erb | 2 +- frontend/src/Metamaps/DataModel/index.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/explore/mapper.html.erb b/app/views/explore/mapper.html.erb index bf3e73c0..9a24bda0 100644 --- a/app/views/explore/mapper.html.erb +++ b/app/views/explore/mapper.html.erb @@ -12,7 +12,7 @@ Metamaps.currentPage = "mapper"; Metamaps.ServerData.Mapper = { models: <%= @maps.to_json.html_safe %>, - id: <%= params[:id] %> + mapperId: <%= params[:id] %> }; Metamaps.GlobalUI.Search.focus(); diff --git a/frontend/src/Metamaps/DataModel/index.js b/frontend/src/Metamaps/DataModel/index.js index 6d41e19f..04690589 100644 --- a/frontend/src/Metamaps/DataModel/index.js +++ b/frontend/src/Metamaps/DataModel/index.js @@ -80,11 +80,11 @@ const DataModel = { var myCollection = serverData.Mine ? serverData.Mine : [] var sharedCollection = serverData.Shared ? serverData.Shared : [] var starredCollection = serverData.Starred ? serverData.Starred : [] - var mapperCollection = [] + var mapperCollection = serverData.Mapper ? serverData.Mapper : [] var mapperOptionsObj = { id: 'mapper', sortBy: 'updated_at' } - if (self.Maps.Mapper.mapperId) { + if (serverData.Mapper.mapperId) { mapperCollection = serverData.Mapper.models - mapperOptionsObj.mapperId = serverData.Mapper.id + mapperOptionsObj.mapperId = serverData.Mapper.mapperId } var featuredCollection = serverData.Featured ? serverData.Featured : [] var activeCollection = serverData.Active ? serverData.Active : []