[ARVADOS] updated: f0358d88ba065369e70a89205ca1ad4ea4700cd1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/provenance_helper.rb            | 2 +-
 services/api/app/controllers/arvados/v1/jobs_controller.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  f0358d88ba065369e70a89205ca1ad4ea4700cd1 (commit)
       via  257004f6162498831d1e47b81514e3311facde3b (commit)
       via  9b16ff9eb231584fcfda5eed029b1c1b08a0b819 (commit)
      from  0e01a46b111ee565c236f3be8d8fed894fc35a5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f0358d88ba065369e70a89205ca1ad4ea4700cd1
Merge: 257004f 9b16ff9
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 06:49:45 2014 -0400

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


commit 257004f6162498831d1e47b81514e3311facde3b
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 06:49:15 2014 -0400

    3583: replace " characters with \" 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 5a9c1bb..677b9cd 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -149,7 +149,7 @@ module ProvenanceHelper
         end
         unless node == ""
           node += "']"
-          node_value = "#{node}".gsub("\"", "'")
+          node_value = "#{node}".gsub("\"", "\\\"")
           gr += "\"#{node_value}\" [label=\"#{node_value}\"];\n"
           gr += edge(job_uuid(job), node_value, {:label => prefix})
         end

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


hooks/post-receive
--