From 1fed4d2f06a0c95553c829f4731de4f01b483b73 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Mon, 7 Jan 2013 23:03:29 -0500 Subject: [PATCH] save synapses to map in saveToMap function wasn't working, but it is now --- app/assets/javascripts/application.js | 18 ++++++++++++++---- app/controllers/maps_controller.rb | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9daf752b..84965039 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -115,14 +115,24 @@ function saveLayout(id) { // this is to save your console to a map function saveToMap() { - var nodes_data = "", syapses_data = ""; + var nodes_data = "", synapses_data = ""; + var synapses_array = new Array(); Mconsole.graph.eachNode(function(n) { nodes_data += n.id + '/' + n.pos.x + '/' + n.pos.y + ','; + n.eachAdjacency(function(adj) { + synapses_array.push(adj.getData("id")); + }); }); - Mconsole.graph.eachAdjacence(function(adj) { - synapses_data += adj.id + ','; - } + + //get unique values only + synapses_array = $.grep(synapses_array, function(value, key){ + return $.inArray(value, synapses_array) === key; + }); + + synapses_data = synapses_array.join(); + console.log(synapses_data); nodes_data = nodes_data.slice(0, -1); + $('#map_topicsToMap').val(nodes_data); $('#map_synapsesToMap').val(synapses_data); $('#new_map').fadeIn('fast'); diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb index 5ae51962..9fe67c24 100644 --- a/app/controllers/maps_controller.rb +++ b/app/controllers/maps_controller.rb @@ -78,12 +78,12 @@ class MapsController < ApplicationController if params[:map][:synapsesToMap] @synAll = params[:map][:synapsesToMap] @synAll = @synAll.split(',') - @synAll.each do |synapse| + @synAll.each do |synapse_id| @mapping = Mapping.new() @mapping.category = "Synapse" @mapping.user = @user @mapping.map = @map - @mapping.synapse = Synapse.find(synapse[0]) + @mapping.synapse = Synapse.find(synapse_id) @mapping.save end end