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

Merge pull request #592 from metamaps/fix/synapse-import

Browse source 
fix: synapse import fails if synapses are missing desc
This commit is contained in:
Devin Howard 2016-08-07 17:21:21 +08:00 committed by GitHub
parent a6951920eb 23543ac7ad
commit fcc1dbdd11
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/src/Metamaps.Import.js
View file

@ -272,7 +272,7 @@ Metamaps.Import = {
name: name, name: name,
metacode_id: metacode.id, metacode_id: metacode.id,
permission: permission || Metamaps.Active.Map.get('permission'), permission: permission || Metamaps.Active.Map.get('permission'),
desc: desc, desc: desc || "",
link: link link: link
}) })
Metamaps.Topics.add(topic) Metamaps.Topics.add(topic)
@ -292,7 +292,7 @@ Metamaps.Import = {
Metamaps.Famous.viz.hideInstructions() Metamaps.Famous.viz.hideInstructions()
}, },
createSynapseWithParameters: function (description, category, permission, createSynapseWithParameters: function (desc, category, permission,
topic1, topic2) { topic1, topic2) {
var node1 = topic1.get('node') var node1 = topic1.get('node')
var node2 = topic2.get('node') var node2 = topic2.get('node')
@ -303,7 +303,7 @@ Metamaps.Import = {
} // if } // if
var synapse = new Metamaps.Backbone.Synapse({ var synapse = new Metamaps.Backbone.Synapse({
desc: description, desc: desc || "",
category: category, category: category,
permission: permission, permission: permission,
node1_id: topic1.id, node1_id: topic1.id,