From 331a3fcd35f4121f54879cdd85f588027a1ed98a Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@clinicalfuture.com>
Date: Tue, 19 Mar 2013 10:11:41 -0700
Subject: [PATCH] rename job command to script. refs #1416

---
 app/helpers/pipeline_invocations_helper.rb   | 4 ++--
 app/views/collections/index.html.erb         | 2 +-
 app/views/collections/show.html.erb          | 6 +++---
 app/views/jobs/index.html.erb                | 6 +++---
 app/views/pipeline_invocations/show.html.erb | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/helpers/pipeline_invocations_helper.rb b/app/helpers/pipeline_invocations_helper.rb
index 69709364b0..d64acf779d 100644
--- a/app/helpers/pipeline_invocations_helper.rb
+++ b/app/helpers/pipeline_invocations_helper.rb
@@ -37,8 +37,8 @@ module PipelineInvocationsHelper
       end
       pj[:progress_detail] = (step[:progress] rescue nil)
       pj[:job_id] = (step[:warehousejob][:id] rescue nil)
-      pj[:command] = step[:function]
-      pj[:command_version] = (step[:warehousejob][:revision] rescue nil)
+      pj[:script] = step[:function]
+      pj[:script_version] = (step[:warehousejob][:revision] rescue nil)
       pj[:output] = step[:output_data_locator]
       pj[:finished_at] = (Time.parse(step[:warehousejob][:finishtime]) rescue nil)
       pj[:progress_bar] = raw("<div class=\"progress\" style=\"width:100px\"><div class=\"bar\" style=\"width:#{pj[:progress]*100}%\"></div></div>")
diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb
index f4b4c43fec..1bd6430936 100644
--- a/app/views/collections/index.html.erb
+++ b/app/views/collections/index.html.erb
@@ -18,7 +18,7 @@
   </thead>
   <tbody>
 
-    <% @collection_info.sort_by { |k,c| c[:created_at] || Time.now }.reverse.each do |uuid, c| %>
+    <% @collection_info.sort_by { |k,c| c[:created_at].is_a?(Time) ? c[:created_at] : Time.now }.reverse.each do |uuid, c| %>
 
     <tr class="collection">
       <td>
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index a473617c65..c325c636df 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -53,7 +53,7 @@
 	<tr class="job">
 	  <td style="padding-bottom: 3em">
             <table class="table" style="margin-bottom: 0; background: #f0f0ff">
-	      <% j.command_parameters.each do |k,v| %>
+	      <% j.script_parameters.each do |k,v| %>
               <tr>
                 <td style="width: 60%">
                   <% re = v.match(/^([0-9a-f]+)/) %>
@@ -86,7 +86,7 @@
             <div style="text-align: center">
               &darr;
               <br />
-	      <span class="btn deemphasize"><%= j.command %><br /><tt><%= link_to_if j.command_version.match(/[0-9a-f]{40}/), j.command_version, "https://redmine.clinicalfuture.com/projects/freefactories/repository/revisions/#{j.command_version}/entry/mapreduce/mr-#{j.command}" if j.command_version %></tt></span>
+	      <span class="btn deemphasize"><%= j.script %><br /><tt><%= link_to_if j.script_version.match(/[0-9a-f]{40}/), j.script_version, "https://redmine.clinicalfuture.com/projects/freefactories/repository/revisions/#{j.script_version}/entry/mapreduce/mr-#{j.script}" if j.script_version %></tt></span>
               <br />
               &darr;
               <br />
@@ -146,7 +146,7 @@
 	    <br />
 	    <tt class="deemphasize"><%= j.submit_id %></tt>
 	  </td><td>
-	    <%= j.command_version %>
+	    <%= j.script_version %>
 	  </td><td>
             <span class="btn <%= if j.success then 'btn-success'; elsif j.active then 'btn-primary'; else 'btn-warning'; end %>">
 	      <%= j.success || j.active ? 'ok' : 'failed' %>
diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb
index 31d3bcb275..210c8a6534 100644
--- a/app/views/jobs/index.html.erb
+++ b/app/views/jobs/index.html.erb
@@ -15,7 +15,7 @@
       <th>
 	id, result, schedule
       </th><th>
-	command, parameters, input, output
+	script, parameters, input, output
       </th><th>
 	resource_limits
       </th>
@@ -88,9 +88,9 @@
       </td><td>
         <table class="table table-condensed table-hover">
           <tr class="info"><td colspan="2">
-              <%= j.command %> <%= j.command_version %>
+              <%= j.script %> <%= j.script_version %>
           </td></tr>
-          <% j.command_parameters.sort.each do |k,v| %>
+          <% j.script_parameters.sort.each do |k,v| %>
           <tr>
             <td><%= k %></td><td><%= link_to_if_orvos_object v %></td>
           </tr>
diff --git a/app/views/pipeline_invocations/show.html.erb b/app/views/pipeline_invocations/show.html.erb
index b2cb23b39e..23c1eddae0 100644
--- a/app/views/pipeline_invocations/show.html.erb
+++ b/app/views/pipeline_invocations/show.html.erb
@@ -8,9 +8,9 @@
     <tr><td><%= attr %></td><td>
         <table class="table">
           <% pipeline_jobs.each do |pj| %>
-          <tr><% %w(index name result job_id command command_version progress_detail progress_bar output_link).each do |key| %>
+          <tr><% %w(index name result job_id script script_version progress_detail progress_bar output_link).each do |key| %>
             <td>
-              <% if key == 'command_version' %>
+              <% if key == 'script_version' %>
               <%= pj[key.to_sym][0..6] rescue '' %>
               <% else %>
               <%= pj[key.to_sym] %>
-- 
2.30.2