From 08c7c3b51774618c39784cfaac13eb6227b351d2 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 3 Nov 2012 20:35:37 -0400 Subject: [PATCH] temporarily showing userid and synapse id on synapses, so that I can try editing them on the staging server --- app/assets/javascripts/Jit/ForceDirected/metamapFD.js | 2 +- app/assets/javascripts/Jit/RGraph/metamapRG.js | 2 +- app/models/item.rb | 1 + app/models/map.rb | 1 + app/models/synapse.rb | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/Jit/ForceDirected/metamapFD.js b/app/assets/javascripts/Jit/ForceDirected/metamapFD.js index 3380cd72..1be37d76 100644 --- a/app/assets/javascripts/Jit/ForceDirected/metamapFD.js +++ b/app/assets/javascripts/Jit/ForceDirected/metamapFD.js @@ -91,7 +91,7 @@ function initFD(){ } //check for edge label in data - var desc = adj.getData("desc"); + var desc = adj.getData("desc") + ' (' + adj.getData("userid") + ',' + adj.getData("id") + ')'; var showDesc = adj.getData("showDesc"); if( desc != "" && showDesc ) { //now adjust the label placement diff --git a/app/assets/javascripts/Jit/RGraph/metamapRG.js b/app/assets/javascripts/Jit/RGraph/metamapRG.js index 2d3775a2..9cef5594 100644 --- a/app/assets/javascripts/Jit/RGraph/metamapRG.js +++ b/app/assets/javascripts/Jit/RGraph/metamapRG.js @@ -91,7 +91,7 @@ function initRG(){ } //check for edge label in data - var desc = adj.getData("desc"); + var desc = adj.getData("desc") + ' (' + adj.getData("userid") + ',' + adj.getData("id") + ')'; var showDesc = adj.getData("showDesc"); if( desc != "" && showDesc ) { //now adjust the label placement diff --git a/app/models/item.rb b/app/models/item.rb index 86e4de23..99af814c 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -64,6 +64,7 @@ belongs_to :item_category @synapsedata['$desc'] = synapse.desc @synapsedata['$showDesc'] = false @synapsedata['$category'] = synapse.category + @synapsedata['$id'] = synapse.id @synapsedata['$userid'] = synapse.user.id @synapsedata['$username'] = synapse.user.name json.data @synapsedata diff --git a/app/models/map.rb b/app/models/map.rb index 2005d13d..fea060d2 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -32,6 +32,7 @@ end @synapsedata['$desc'] = synapse.desc @synapsedata['$showDesc'] = false @synapsedata['$category'] = synapse.category + @synapsedata['$id'] = synapse.id @synapsedata['$userid'] = synapse.user.id @synapsedata['$username'] = synapse.user.name json.data @synapsedata diff --git a/app/models/synapse.rb b/app/models/synapse.rb index 81c6190c..22a8299d 100644 --- a/app/models/synapse.rb +++ b/app/models/synapse.rb @@ -16,6 +16,7 @@ has_many :maps, :through => :mappings @synapsedata['$desc'] = self.desc @synapsedata['$showDesc'] = false @synapsedata['$category'] = self.category + @synapsedata['$id'] = synapse.id @synapsedata['$userid'] = synapse.user.id @synapsedata['$username'] = synapse.user.name json.data @synapsedata @@ -37,6 +38,7 @@ has_many :maps, :through => :mappings @synapsedata['$desc'] = synapse.desc @synapsedata['$showDesc'] = false @synapsedata['$category'] = synapse.category + @synapsedata['$id'] = synapse.id @synapsedata['$userid'] = synapse.user.id @synapsedata['$username'] = synapse.user.name json.data @synapsedata