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

brute force prevent nil synapse descriptions

Browse source
This commit is contained in:
Devin Howard 2015-10-23 22:10:45 +08:00
parent 588b62b942
commit 96871cadab
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/src/Metamaps.js
View file

@ -4282,7 +4282,7 @@ Metamaps.Synapse = {
node1 = synapsesToCreate[i]; node1 = synapsesToCreate[i];
topic1 = node1.getData('topic'); topic1 = node1.getData('topic');
synapse = new Metamaps.Backbone.Synapse({ synapse = new Metamaps.Backbone.Synapse({
desc: Metamaps.Create.newSynapse.description, desc: Metamaps.Create.newSynapse.description || "",
node1_id: topic1.isNew() ? topic1.cid : topic1.id, node1_id: topic1.isNew() ? topic1.cid : topic1.id,
node2_id: topic2.isNew() ? topic2.cid : topic2.id, node2_id: topic2.isNew() ? topic2.cid : topic2.id,
}); });

2
app/controllers/synapses_controller.rb
View file

@ -22,6 +22,7 @@ class SynapsesController < ApplicationController
# POST /synapses.json # POST /synapses.json
def create def create
@synapse = Synapse.new(synapse_params) @synapse = Synapse.new(synapse_params)
@synapse.update_attribute :desc, "" if @synapse.desc.nil?
respond_to do |format| respond_to do |format|
if @synapse.save if @synapse.save
@ -36,6 +37,7 @@ class SynapsesController < ApplicationController
# PUT /synapses/1.json # PUT /synapses/1.json
def update def update
@synapse = Synapse.find(params[:id]) @synapse = Synapse.find(params[:id])
@synapse.update_attribute :desc, "" if @synapse.desc.nil?
respond_to do |format| respond_to do |format|
if @synapse.update_attributes(synapse_params) if @synapse.update_attributes(synapse_params)