[ARVADOS] created: 0e01a46b111ee565c236f3be8d8fed894fc35a5e

git at public.curoverse.com git at public.curoverse.com
Wed Oct 1 13:53:52 EDT 2014


        at  0e01a46b111ee565c236f3be8d8fed894fc35a5e (commit)


commit 0e01a46b111ee565c236f3be8d8fed894fc35a5e
Merge: 1779b84 74cdb44
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 1 13:33:37 2014 -0400

    Merge branch 'master' into 3583-provenance-graph-issue


commit 1779b8427b66ae59340570f37c8f34e9ef2228f4
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 1 13:31:15 2014 -0400

    3583: replace " characters with ' characters in node value to ensure graph does not get mixed up on node labels.

diff --git a/apps/workbench/app/helpers/provenance_helper.rb b/apps/workbench/app/helpers/provenance_helper.rb
index e4ef470..5a9c1bb 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -149,8 +149,9 @@ module ProvenanceHelper
         end
         unless node == ""
           node += "']"
-          gr += "\"#{node}\" [label=\"#{node}\"];\n"
-          gr += edge(job_uuid(job), node, {:label => prefix})
+          node_value = "#{node}".gsub("\"", "'")
+          gr += "\"#{node_value}\" [label=\"#{node_value}\"];\n"
+          gr += edge(job_uuid(job), node_value, {:label => prefix})
         end
       when String
         return '' if sp.empty?

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list