[ARVADOS] updated: 7daa6c8ccfc68ec189b42522fa1481b7c31174a8
git at public.curoverse.com
git at public.curoverse.com
Sun Jul 13 15:58:35 EDT 2014
Summary of changes:
.../app/controllers/application_controller.rb | 15 +++++---
.../app/controllers/projects_controller.rb | 45 +++++++++++++---------
.../_show_advanced_cli_example.html.erb | 2 +-
.../app/views/application/_show_api.html.erb | 2 +-
.../app/views/authorized_keys/_show_help.html.erb | 2 +-
.../notifications/_ssh_key_notification.html.erb | 2 +-
.../views/projects/_show_data_collections.html.erb | 9 ++++-
.../projects/_show_jobs_and_pipelines.html.erb | 9 ++++-
.../views/projects/_show_other_objects.html.erb | 9 ++++-
.../projects/_show_pipeline_templates.html.erb | 9 ++++-
.../app/views/projects/_show_subprojects.html.erb | 9 ++++-
.../app/views/projects/_show_tab_contents.html.erb | 16 +-------
.../app/views/repositories/_show_help.html.erb | 2 +-
.../app/views/virtual_machines/_show_help.html.erb | 2 +-
doc/install/install-docker.html.textile.liquid | 14 +++++++
.../topics/tutorial-job-debug.html.textile.liquid | 5 ++-
docker/api/Dockerfile | 10 ++---
docker/api/apache2_foreground.sh | 5 ---
docker/api/passenger.conf | 3 --
docker/api/ssh.sh | 10 +++++
docker/api/supervisor.conf | 5 +++
docker/arvdock | 2 +-
docker/base/Dockerfile | 20 ++++------
docker/build_tools/Makefile | 9 ++---
docker/doc/Dockerfile | 4 +-
docker/passenger/Dockerfile | 4 +-
docker/sso/Dockerfile | 7 ++--
docker/sso/passenger.conf | 3 --
docker/workbench/Dockerfile | 6 +--
docker/workbench/passenger.conf | 3 --
sdk/cli/bin/arv-run-pipeline-instance | 6 +--
31 files changed, 147 insertions(+), 102 deletions(-)
delete mode 100644 docker/api/passenger.conf
create mode 100755 docker/api/ssh.sh
delete mode 100644 docker/sso/passenger.conf
delete mode 100644 docker/workbench/passenger.conf
via 7daa6c8ccfc68ec189b42522fa1481b7c31174a8 (commit)
via 1a7dc46ec7237d5ca1c4894c977bf6ce5b29763e (commit)
via 76116fc706e2580e530d40b0e5f85783289150bf (commit)
via f97f243abfaaae4b04d0dc7fc02e6f54685b16fb (commit)
via 4a7ca048ea3f26fa8c417001bd5b9d2c1ab62e71 (commit)
via 8b185ea4dda14333a099964589d8d57aef3f1403 (commit)
via b93a012bf18d1327cdba3d50eb35332253a1a8de (commit)
via 56e82fff1e2bc9597c06f2d14d43360c02704aa6 (commit)
via 171f4d2935ce982b014c94ab358c30a602aa4980 (commit)
via 85706e064ed0e0e1742ff5fbbc61733552afc827 (commit)
via 60c18cbf3175fb7300af732466c3b0be2c974d16 (commit)
via acc4448c1691661f9b0834e98d837b6a8d47a887 (commit)
via b989c72d3a2321f2a5d8d8226481d0adeb0a546c (commit)
via 8c41d740562d1b3efb61489e285353d689301743 (commit)
via 5a068be79fad0efa8060001673a86632a594c040 (commit)
from 463238074dadc8dd507224e848fe4d1432136d84 (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 7daa6c8ccfc68ec189b42522fa1481b7c31174a8
Merge: 1a7dc46 76116fc
Author: radhika <radhika at curoverse.com>
Date: Sun Jul 13 15:58:19 2014 -0400
Merge branch 'master' into 3140-project-content-tabs
commit 1a7dc46ec7237d5ca1c4894c977bf6ce5b29763e
Author: radhika <radhika at curoverse.com>
Date: Sun Jul 13 15:23:25 2014 -0400
3140: infinite scrolling in tab content display
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index ee9ef4d..c123b29 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -29,7 +29,7 @@
<col width="40%" />
<col width="60%" />
</colgroup>
- <tbody data-infinite-scroller="#Contents-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: "#{page_offset}", filters: "#{filters}") if page_offset %>">
+ <tbody data-infinite-scroller="#Contents-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: page_offset, filters: "#{filters}") if page_offset %>">
<%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: objects_and_names} %>
</tbody>
<thead>
commit f97f243abfaaae4b04d0dc7fc02e6f54685b16fb
Author: radhika <radhika at curoverse.com>
Date: Sat Jul 12 23:08:00 2014 -0400
3140: address tab content mangling issue when infinte scrolling is applied to tabs due to large data.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 7d7ea95..ea46091 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -132,12 +132,15 @@ class ApplicationController < ActionController::Base
end
helper_method :next_page_offset
- def next_page_offset
- if @objects.respond_to?(:result_offset) and
- @objects.respond_to?(:result_limit) and
- @objects.respond_to?(:items_available)
- next_offset = @objects.result_offset + @objects.result_limit
- if next_offset < @objects.items_available
+ def next_page_offset objects=nil
+ if !objects
+ objects = @objects
+ end
+ if objects.respond_to?(:result_offset) and
+ objects.respond_to?(:result_limit) and
+ objects.respond_to?(:items_available)
+ next_offset = objects.result_offset + objects.result_limit
+ if next_offset < objects.items_available
next_offset
else
nil
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 91d6e8a..108cb60 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -8,7 +8,7 @@ class ProjectsController < ApplicationController
end
def show_pane_list
- %w(Contents Permissions Advanced)
+ %w(Data_collections Jobs_and_pipelines Pipeline_templates Subprojects Other_objects Permissions Advanced)
end
def remove_item
@@ -79,28 +79,14 @@ class ProjectsController < ApplicationController
end
@objects = @object.contents(limit: 50,
include_linked: true,
+ filters: params[:filters],
offset: params[:offset] || 0)
@share_links = Link.filter([['head_uuid', '=', @object.uuid],
['link_class', '=', 'permission']])
@logs = Log.limit(10).filter([['object_uuid', '=', @object.uuid]])
- @objects_and_names = []
- @objects.each do |object|
- if !(name_links = @objects.links_for(object, 'name')).empty?
- name_links.each do |name_link|
- @objects_and_names << [object, name_link]
- end
- elsif object.respond_to? :name
- @objects_and_names << [object, object]
- else
- @objects_and_names << [object,
- Link.new(owner_uuid: @object.uuid,
- tail_uuid: @object.uuid,
- head_uuid: object.uuid,
- link_class: "name",
- name: "")]
- end
- end
+ @objects_and_names = get_objects_and_names @objects
+
if params[:partial]
respond_to do |f|
f.json {
@@ -131,4 +117,27 @@ class ProjectsController < ApplicationController
@updates = params['project']
super
end
+
+ helper_method :get_objects_and_names
+ def get_objects_and_names(objects)
+ objects_and_names = []
+ objects.each do |object|
+ if !(name_links = objects.links_for(object, 'name')).empty?
+ name_links.each do |name_link|
+ objects_and_names << [object, name_link]
+ end
+ elsif object.respond_to? :name
+ objects_and_names << [object, object]
+ else
+ objects_and_names << [object,
+ Link.new(owner_uuid: @object.uuid,
+ tail_uuid: @object.uuid,
+ head_uuid: object.uuid,
+ link_class: "name",
+ name: "")]
+ end
+ end
+ objects_and_names
+ end
+
end
diff --git a/apps/workbench/app/views/projects/_show_data_collections.html.erb b/apps/workbench/app/views/projects/_show_data_collections.html.erb
index c632324..9198c65 100644
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -55,4 +55,11 @@
<% end %>
<% end %>
-<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: @objects_and_names, data_kind: ['arvados#collection']} %>
+<%
+ filters = [['uuid', 'is_a', "arvados#collection"]]
+ @objects = @object.contents({limit: 50, include_linked: true, :filters => filters})
+ objects_and_names = get_objects_and_names @objects
+ page_offset = next_page_offset @objects
+%>
+
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset} %>
diff --git a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
index 619e51b..9b42452 100644
--- a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
+++ b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
@@ -1 +1,8 @@
-<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: @objects_and_names, data_kind: ['arvados#job', 'arvados#pipelineInstance']} %>
+<%
+ filters = [['uuid', 'is_a', ["arvados#pipelineInstance","arvados#job"]]]
+ @objects = @object.contents({limit: 50, include_linked: true, :filters => filters})
+ objects_and_names = get_objects_and_names @objects
+ page_offset = next_page_offset @objects
+%>
+
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset} %>
diff --git a/apps/workbench/app/views/projects/_show_other_objects.html.erb b/apps/workbench/app/views/projects/_show_other_objects.html.erb
index 7a87413..3275ac7 100644
--- a/apps/workbench/app/views/projects/_show_other_objects.html.erb
+++ b/apps/workbench/app/views/projects/_show_other_objects.html.erb
@@ -1 +1,8 @@
-<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: @objects_and_names, data_kind: []} %>
+<%
+ filters = [['uuid', 'is_a', ["arvados#human","arvados#specimen","arvados#trait"]]]
+ @objects = @object.contents({limit: 50, include_linked: true, :filters => filters})
+ objects_and_names = get_objects_and_names @objects
+ page_offset = next_page_offset @objects
+%>
+
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset} %>
diff --git a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
index 26082c0..5497f12 100644
--- a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
+++ b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
@@ -1 +1,8 @@
-<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: @objects_and_names, data_kind: ['arvados#pipelineTemplate']} %>
+<%
+ filters = [['uuid', 'is_a', "arvados#pipelineTemplate"]]
+ @objects = @object.contents({limit: 50, include_linked: true, :filters => filters})
+ objects_and_names = get_objects_and_names @objects
+ page_offset = next_page_offset @objects
+%>
+
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset} %>
diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb
index cd9c3e6..6e93a4a 100644
--- a/apps/workbench/app/views/projects/_show_subprojects.html.erb
+++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb
@@ -1 +1,8 @@
-<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: @objects_and_names, data_kind: ['arvados#group']} %>
+<%
+ filters = [['uuid', 'is_a', "arvados#group"]]
+ @objects = @object.contents({limit: 50, include_linked: true, :filters => filters})
+ objects_and_names = get_objects_and_names @objects
+ page_offset = next_page_offset @objects
+%>
+
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset} %>
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index e95ba72..ee9ef4d 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -24,25 +24,13 @@
</div>
</div>
- <%
- selected_objects_and_names = []
- specific_data_kinds = ['arvados#collection', 'arvados#group', 'arvados#job', 'arvados#pipelineInstance', 'arvados#pipelineTemplate']
- @objects_and_names.each do |object, name_link|
- if !data_kind.any? && !specific_data_kinds.include?(object.kind)
- selected_objects_and_names << [object, name_link]
- elsif data_kind.include?(object.kind)
- selected_objects_and_names << [object, name_link]
- end
- end
- %>
-
<table class="table table-condensed table-fixedlayout arv-index arv-project-contents" style="overflow-x: hidden">
<colgroup>
<col width="40%" />
<col width="60%" />
</colgroup>
- <tbody data-infinite-scroller="#Contents-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: next_page_offset) if next_page_offset %>">
- <%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: selected_objects_and_names} %>
+ <tbody data-infinite-scroller="#Contents-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: "#{page_offset}", filters: "#{filters}") if page_offset %>">
+ <%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: objects_and_names} %>
</tbody>
<thead>
<tr>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list