glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix mapper page (#1050)

Browse source
This commit is contained in:
Devin Howard 2017-01-28 15:44:38 -05:00 • committed by GitHub
parent c60f7f4525
commit 53bc4ee1c8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/explore/mapper.html.erb
View file

@ -12,7 +12,7 @@
Metamaps.currentPage = "mapper"; Metamaps.currentPage = "mapper";
Metamaps.ServerData.Mapper = { Metamaps.ServerData.Mapper = {
models: <%= @maps.to_json.html_safe %>, models: <%= @maps.to_json.html_safe %>,
id: <%= params[:id] %> mapperId: <%= params[:id] %>
}; };
Metamaps.GlobalUI.Search.focus(); Metamaps.GlobalUI.Search.focus();
</script> </script>

6
frontend/src/Metamaps/DataModel/index.js
View file

@ -80,11 +80,11 @@ const DataModel = {
var myCollection = serverData.Mine ? serverData.Mine : [] var myCollection = serverData.Mine ? serverData.Mine : []
var sharedCollection = serverData.Shared ? serverData.Shared : [] var sharedCollection = serverData.Shared ? serverData.Shared : []
var starredCollection = serverData.Starred ? serverData.Starred : [] var starredCollection = serverData.Starred ? serverData.Starred : []
var mapperCollection = [] var mapperCollection = serverData.Mapper ? serverData.Mapper : []
var mapperOptionsObj = { id: 'mapper', sortBy: 'updated_at' } var mapperOptionsObj = { id: 'mapper', sortBy: 'updated_at' }
if (self.Maps.Mapper.mapperId) { if (serverData.Mapper.mapperId) {
mapperCollection = serverData.Mapper.models mapperCollection = serverData.Mapper.models
mapperOptionsObj.mapperId = serverData.Mapper.id mapperOptionsObj.mapperId = serverData.Mapper.mapperId
} }
var featuredCollection = serverData.Featured ? serverData.Featured : [] var featuredCollection = serverData.Featured ? serverData.Featured : []
var activeCollection = serverData.Active ? serverData.Active : [] var activeCollection = serverData.Active ? serverData.Active : []