[ARVADOS] updated: f7ea83efa36ad9035cae34ac3b9ee5216347af20

git at public.curoverse.com git at public.curoverse.com
Wed Jun 11 22:22:49 EDT 2014


Summary of changes:
 apps/workbench/app/assets/stylesheets/log_viewer.scss | 2 +-
 apps/workbench/app/views/jobs/_show_log.html.erb      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

       via  f7ea83efa36ad9035cae34ac3b9ee5216347af20 (commit)
      from  0c88e01029446c985d5882fc3f45aa0f8549642a (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 f7ea83efa36ad9035cae34ac3b9ee5216347af20
Author: peter <peter at swyman.shell.4xphq.arvadosapi.com>
Date:   Thu Jun 12 02:22:44 2014 +0000

    2883: Adjusted task type column width.  Commented out code for working with
    live-updating logs, it almost works but there are some complications.

diff --git a/apps/workbench/app/assets/stylesheets/log_viewer.scss b/apps/workbench/app/assets/stylesheets/log_viewer.scss
index 5c4a729..f88ae3d 100644
--- a/apps/workbench/app/assets/stylesheets/log_viewer.scss
+++ b/apps/workbench/app/assets/stylesheets/log_viewer.scss
@@ -13,7 +13,7 @@
      width: 15em;
    }
    th.type {
-     width: 9em;
+     width: 10em;
    }
    th.taskid {
      width: 3em;
diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 06d7df1..c1f1b33 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -77,16 +77,17 @@ $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
     $("#logloadspinner").detach();
   });
 <% else %>
-  <% backlog = ""
+  <%# backlog = ""
      Log.filter([['object_uuid', '=', @object.uuid],
                   ['event_type', '=', 'stderr']]).order(["id", "asc"]).each do |l|
-        backlog += l.properties["text"]
+        backlog += l.properties[:text]
      end
    %>
-  var backlog = "<%=j backlog %>";
+
+  /* var backlog = "<%#=j backlog %>";
     logViewer.filter();
     addToLogViewer(logViewer, backlog.split("\n"));
-    logViewer.filter(makeFilter());
+    logViewer.filter(makeFilter());  */
 
 <% end %>
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list