[ARVADOS] updated: 45bbd49852b4fbd5a6d69122bd4c620c7c9e4674

git at public.curoverse.com git at public.curoverse.com
Thu Feb 27 18:29:49 EST 2014


Summary of changes:
 .../app/views/layouts/application.html.erb         |    2 +-
 .../app/views/pipeline_instances/show.html.erb     |    1 +
 .../{_show_graph.js.erb => show.js.erb}            |    3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 120000 apps/workbench/app/views/pipeline_instances/show.html.erb
 rename apps/workbench/app/views/pipeline_instances/{_show_graph.js.erb => show.js.erb} (74%)

       via  45bbd49852b4fbd5a6d69122bd4c620c7c9e4674 (commit)
      from  0a29f4ca64bcb4ee01d641d8bda7da7ad550e6dd (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 45bbd49852b4fbd5a6d69122bd4c620c7c9e4674
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 27 15:24:58 2014 -0800

    Fix refresh feature on pipeline_instances/show.
    
    Note symbolic link to ../application/show.html.erb seems to be
    necessary for "render template: 'pipeline_instances/show'" to work;
    rails doesn't fall back to application/show automatically here.

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 0716bcc..1dc6284 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -176,7 +176,7 @@
 
   <div class="container-fluid">
       <div class="col-sm-9 col-sm-offset-3">
-        <div id="content">
+        <div id="content" class="body-content">
           <%= yield %>
         </div>
       </div>
diff --git a/apps/workbench/app/views/pipeline_instances/show.html.erb b/apps/workbench/app/views/pipeline_instances/show.html.erb
new file mode 120000
index 0000000..4316b10
--- /dev/null
+++ b/apps/workbench/app/views/pipeline_instances/show.html.erb
@@ -0,0 +1 @@
+../application/show.html.erb
\ No newline at end of file
diff --git a/apps/workbench/app/views/pipeline_instances/_show_graph.js.erb b/apps/workbench/app/views/pipeline_instances/show.js.erb
similarity index 74%
rename from apps/workbench/app/views/pipeline_instances/_show_graph.js.erb
rename to apps/workbench/app/views/pipeline_instances/show.js.erb
index 9460f0b..fc11e64 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_graph.js.erb
+++ b/apps/workbench/app/views/pipeline_instances/show.js.erb
@@ -1,3 +1,4 @@
-var new_content = "<%= escape_javascript(render template: 'pipeline_instances/show.html') %>";
+<% self.formats = [:html] %>
+var new_content = "<%= escape_javascript(render template: 'pipeline_instances/show') %>";
 if ($('div.body-content').html() != new_content)
    $('div.body-content').html(new_content);

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list