[ARVADOS] updated: 45fc3d3d557ed56b4e09d7ba254dc8add1211eed
Git user
git at public.curoverse.com
Wed Jul 13 13:51:49 EDT 2016
Summary of changes:
apps/workbench/app/controllers/work_units_controller.rb | 2 +-
apps/workbench/app/views/container_requests/_show_log.html.erb | 2 +-
apps/workbench/app/views/container_requests/_show_status.html.erb | 2 +-
apps/workbench/app/views/containers/_show_log.html.erb | 2 +-
apps/workbench/app/views/containers/_show_status.html.erb | 2 +-
apps/workbench/app/views/jobs/_show_status.html.erb | 2 +-
.../app/views/pipeline_instances/_show_components.html.erb | 2 +-
apps/workbench/app/views/projects/_show_dashboard.html.erb | 2 +-
apps/workbench/app/views/work_unit/_show_status.html.erb | 6 ------
.../app/views/{work_unit => work_units}/_component_detail.html.erb | 2 +-
.../app/views/{work_unit => work_units}/_progress.html.erb | 0
.../views/{work_unit => work_units}/_show_all_processes.html.erb | 0
.../{work_unit => work_units}/_show_all_processes_rows.html.erb | 2 +-
.../app/views/{work_unit => work_units}/_show_child.html.erb | 6 +++---
.../app/views/{work_unit => work_units}/_show_component.html.erb | 6 +++---
.../app/views/{work_unit => work_units}/_show_log.html.erb | 0
.../app/views/{work_unit => work_units}/_show_output.html.erb | 2 +-
.../app/views/{work_unit => work_units}/_show_outputs.html.erb | 0
apps/workbench/app/views/work_units/_show_status.html.erb | 6 ++++++
apps/workbench/app/views/work_units/index.html.erb | 2 +-
20 files changed, 24 insertions(+), 24 deletions(-)
delete mode 100644 apps/workbench/app/views/work_unit/_show_status.html.erb
rename apps/workbench/app/views/{work_unit => work_units}/_component_detail.html.erb (97%)
rename apps/workbench/app/views/{work_unit => work_units}/_progress.html.erb (100%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_all_processes.html.erb (100%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_all_processes_rows.html.erb (87%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_child.html.erb (89%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_component.html.erb (89%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_log.html.erb (100%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_output.html.erb (78%)
rename apps/workbench/app/views/{work_unit => work_units}/_show_outputs.html.erb (100%)
create mode 100644 apps/workbench/app/views/work_units/_show_status.html.erb
via 45fc3d3d557ed56b4e09d7ba254dc8add1211eed (commit)
from 25919f35ed49a1121dafb57b14b591420b280e91 (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 45fc3d3d557ed56b4e09d7ba254dc8add1211eed
Author: radhika <radhika at curoverse.com>
Date: Wed Jul 13 13:49:18 2016 -0400
9319: move all files from views/work_unit into views/work_units
diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index 6ed9482..fbb0c1c 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -5,7 +5,7 @@ class WorkUnitsController < ApplicationController
if params[:partial]
@next_page_href = next_page_href(partial: params[:partial], filters: @filters.to_json)
render json: {
- content: render_to_string(partial: "work_unit/show_#{params[:partial]}",
+ content: render_to_string(partial: "work_units/show_#{params[:partial]}",
formats: [:html]),
next_page_href: @next_page_href
}
diff --git a/apps/workbench/app/views/container_requests/_show_log.html.erb b/apps/workbench/app/views/container_requests/_show_log.html.erb
index 4126f12..f623fd6 100644
--- a/apps/workbench/app/views/container_requests/_show_log.html.erb
+++ b/apps/workbench/app/views/container_requests/_show_log.html.erb
@@ -1 +1 @@
-<%= render(partial: 'work_unit/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
diff --git a/apps/workbench/app/views/container_requests/_show_status.html.erb b/apps/workbench/app/views/container_requests/_show_status.html.erb
index d6d8c67..fc3f7be 100644
--- a/apps/workbench/app/views/container_requests/_show_status.html.erb
+++ b/apps/workbench/app/views/container_requests/_show_status.html.erb
@@ -1 +1 @@
-<%= render(partial: 'work_unit/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
diff --git a/apps/workbench/app/views/containers/_show_log.html.erb b/apps/workbench/app/views/containers/_show_log.html.erb
index 4126f12..f623fd6 100644
--- a/apps/workbench/app/views/containers/_show_log.html.erb
+++ b/apps/workbench/app/views/containers/_show_log.html.erb
@@ -1 +1 @@
-<%= render(partial: 'work_unit/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
diff --git a/apps/workbench/app/views/containers/_show_status.html.erb b/apps/workbench/app/views/containers/_show_status.html.erb
index 00a5592..b6a2371 100644
--- a/apps/workbench/app/views/containers/_show_status.html.erb
+++ b/apps/workbench/app/views/containers/_show_status.html.erb
@@ -1,4 +1,4 @@
-<%= render(partial: 'work_unit/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index 6b1ea03..bb5444f 100644
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -1,4 +1,4 @@
-<%= render(partial: 'work_unit/show_status', locals: {current_obj: @object, name: @object[:name] || 'this job'}) %>
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this job'}) %>
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index 4196558..b79759f 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -9,7 +9,7 @@
data-object-uuids="<%= @object.uuid %> <%= job_uuids.join(' ') %>"
></div>
- <%= render partial: 'work_unit/show_component', locals: {wu: @object.work_unit(@object.name)} %>
+ <%= render partial: 'work_units/show_component', locals: {wu: @object.work_unit(@object.name)} %>
<% else %>
<%# state is either New or Ready %>
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 585bc4a..afca246 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -53,7 +53,7 @@
Active for <%= render_runtime(wu_time, false) %>
<% end %>
- <%= render partial: 'work_unit/show_output', locals: {wu: wu, align: 'pull-right', include_icon: true} %>
+ <%= render partial: 'work_units/show_output', locals: {wu: wu, align: 'pull-right', include_icon: true} %>
</div>
</div>
diff --git a/apps/workbench/app/views/work_unit/_show_status.html.erb b/apps/workbench/app/views/work_unit/_show_status.html.erb
deleted file mode 100644
index 0c1e80e..0000000
--- a/apps/workbench/app/views/work_unit/_show_status.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="arv-log-refresh-control"
- data-load-throttle="15000"
- ></div>
-<%=
- render(partial: 'work_unit/show_component', locals: {wu: current_obj.work_unit(name)})
-%>
diff --git a/apps/workbench/app/views/work_unit/_component_detail.html.erb b/apps/workbench/app/views/work_units/_component_detail.html.erb
similarity index 97%
rename from apps/workbench/app/views/work_unit/_component_detail.html.erb
rename to apps/workbench/app/views/work_units/_component_detail.html.erb
index ba9d3ce..e15cc44 100644
--- a/apps/workbench/app/views/work_unit/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -27,7 +27,7 @@
<% if val.size == 1 %>
<%= link_to_arvados_object_if_readable(val[0], 'Output data not available', friendly_name: true) %>
<% else %>
- <%= render partial: 'work_unit/show_outputs', locals: {id: current_obj.uuid, outputs: val, align:""} %>
+ <%= render partial: 'work_units/show_outputs', locals: {id: current_obj.uuid, outputs: val, align:""} %>
<% end %>
<% else %>
<%= val %>
diff --git a/apps/workbench/app/views/work_unit/_progress.html.erb b/apps/workbench/app/views/work_units/_progress.html.erb
similarity index 100%
rename from apps/workbench/app/views/work_unit/_progress.html.erb
rename to apps/workbench/app/views/work_units/_progress.html.erb
diff --git a/apps/workbench/app/views/work_unit/_show_all_processes.html.erb b/apps/workbench/app/views/work_units/_show_all_processes.html.erb
similarity index 100%
rename from apps/workbench/app/views/work_unit/_show_all_processes.html.erb
rename to apps/workbench/app/views/work_units/_show_all_processes.html.erb
diff --git a/apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb b/apps/workbench/app/views/work_units/_show_all_processes_rows.html.erb
similarity index 87%
rename from apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb
rename to apps/workbench/app/views/work_units/_show_all_processes_rows.html.erb
index 16d28f6..0652a9d 100644
--- a/apps/workbench/app/views/work_unit/_show_all_processes_rows.html.erb
+++ b/apps/workbench/app/views/work_units/_show_all_processes_rows.html.erb
@@ -14,7 +14,7 @@
<%= render_localized_date(wu.created_at) %>
</td>
<td>
- <%= render partial: 'work_unit/show_output', locals: {wu: wu, align: ''} %>
+ <%= render partial: 'work_units/show_output', locals: {wu: wu, align: ''} %>
</td>
<td>
<%= render partial: 'delete_object_button', locals: {object:obj} %>
diff --git a/apps/workbench/app/views/work_unit/_show_child.html.erb b/apps/workbench/app/views/work_units/_show_child.html.erb
similarity index 89%
rename from apps/workbench/app/views/work_unit/_show_child.html.erb
rename to apps/workbench/app/views/work_units/_show_child.html.erb
index a9c8d2f..1d5ae63 100644
--- a/apps/workbench/app/views/work_unit/_show_child.html.erb
+++ b/apps/workbench/app/views/work_units/_show_child.html.erb
@@ -11,7 +11,7 @@
</div>
<div class="col-md-2 pipeline-instance-spacing">
- <%= render partial: 'work_unit/progress', locals: {wu: current_obj} %>
+ <%= render partial: 'work_units/progress', locals: {wu: current_obj} %>
</div>
<% if not current_obj %>
@@ -48,7 +48,7 @@
<% if outputs.size == 1 %>
<%= link_to_arvados_object_if_readable(outputs[0], 'Output data not available', link_text: "Output of #{current_obj.label}") %>
<% else %>
- <%= render partial: 'work_unit/show_outputs', locals: {id: current_obj.uuid, outputs: outputs, align:"pull-right"} %>
+ <%= render partial: 'work_units/show_outputs', locals: {id: current_obj.uuid, outputs: outputs, align:"pull-right"} %>
<% end %>
<% else %>
No output.
@@ -71,7 +71,7 @@
<div id="collapse<%= i %>" class="panel-collapse collapse <%= if expanded then 'in' end %>">
<div class="panel-body">
- <%= render partial: 'work_unit/show_component', locals: {wu: current_obj} %>
+ <%= render partial: 'work_units/show_component', locals: {wu: current_obj} %>
</div>
</div>
</div>
diff --git a/apps/workbench/app/views/work_unit/_show_component.html.erb b/apps/workbench/app/views/work_units/_show_component.html.erb
similarity index 89%
rename from apps/workbench/app/views/work_unit/_show_component.html.erb
rename to apps/workbench/app/views/work_units/_show_component.html.erb
index da3e5a7..43f5692 100644
--- a/apps/workbench/app/views/work_unit/_show_component.html.erb
+++ b/apps/workbench/app/views/work_units/_show_component.html.erb
@@ -14,7 +14,7 @@
<% end %>
</div>
<div class="col-md-3">
- <%= render partial: 'work_unit/progress', locals: {wu: wu} %>
+ <%= render partial: 'work_units/progress', locals: {wu: wu} %>
</div>
<div class="col-md-1">
<% if wu.can_cancel? and @object.editable? %>
@@ -43,7 +43,7 @@
</div>
<p>
- <%= render(partial: 'work_unit/component_detail', locals: {current_obj: wu}) %>
+ <%= render(partial: 'work_units/component_detail', locals: {current_obj: wu}) %>
</p>
<%# Work unit children %>
@@ -71,6 +71,6 @@
<% @descendent_count = 0 if !@descendent_count %>
<% wu.children.each do |c| %>
<% @descendent_count += 1 %>
- <%= render(partial: 'work_unit/show_child', locals: {current_obj: c, i: @descendent_count, expanded: false}) %>
+ <%= render(partial: 'work_units/show_child', locals: {current_obj: c, i: @descendent_count, expanded: false}) %>
<% end %>
<% end %>
diff --git a/apps/workbench/app/views/work_unit/_show_log.html.erb b/apps/workbench/app/views/work_units/_show_log.html.erb
similarity index 100%
rename from apps/workbench/app/views/work_unit/_show_log.html.erb
rename to apps/workbench/app/views/work_units/_show_log.html.erb
diff --git a/apps/workbench/app/views/work_unit/_show_output.html.erb b/apps/workbench/app/views/work_units/_show_output.html.erb
similarity index 78%
rename from apps/workbench/app/views/work_unit/_show_output.html.erb
rename to apps/workbench/app/views/work_units/_show_output.html.erb
index 78032bb..83dabd1 100644
--- a/apps/workbench/app/views/work_unit/_show_output.html.erb
+++ b/apps/workbench/app/views/work_units/_show_output.html.erb
@@ -8,6 +8,6 @@
<% end %>
<%= link_to_if_arvados_object outputs[0], friendly_name: true %>
<% else %>
- <%= render partial: 'work_unit/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:align} %>
+ <%= render partial: 'work_units/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:align} %>
<% end %>
</span>
diff --git a/apps/workbench/app/views/work_unit/_show_outputs.html.erb b/apps/workbench/app/views/work_units/_show_outputs.html.erb
similarity index 100%
rename from apps/workbench/app/views/work_unit/_show_outputs.html.erb
rename to apps/workbench/app/views/work_units/_show_outputs.html.erb
diff --git a/apps/workbench/app/views/work_units/_show_status.html.erb b/apps/workbench/app/views/work_units/_show_status.html.erb
new file mode 100644
index 0000000..4b629c8
--- /dev/null
+++ b/apps/workbench/app/views/work_units/_show_status.html.erb
@@ -0,0 +1,6 @@
+<div class="arv-log-refresh-control"
+ data-load-throttle="15000"
+ ></div>
+<%=
+ render(partial: 'work_units/show_component', locals: {wu: current_obj.work_unit(name)})
+%>
diff --git a/apps/workbench/app/views/work_units/index.html.erb b/apps/workbench/app/views/work_units/index.html.erb
index c29002a..b6e978d 100644
--- a/apps/workbench/app/views/work_units/index.html.erb
+++ b/apps/workbench/app/views/work_units/index.html.erb
@@ -1 +1 @@
-<%= render partial: 'work_unit/show_all_processes' %>
+<%= render partial: 'work_units/show_all_processes' %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list