[ARVADOS] updated: 36e6ade5a578f3f10e048ba545c4448a71137282

git at public.curoverse.com git at public.curoverse.com
Tue Jul 15 11:03:47 EDT 2014


Summary of changes:
 .../views/projects/_show_data_collections.html.erb |    2 +-
 .../projects/_show_jobs_and_pipelines.html.erb     |    2 +-
 .../views/projects/_show_other_objects.html.erb    |    2 +-
 .../projects/_show_pipeline_templates.html.erb     |    2 +-
 .../app/views/projects/_show_subprojects.html.erb  |    2 +-
 .../app/views/projects/_show_tab_contents.html.erb |    6 +-
 sdk/cli/bin/crunch-job                             |   44 +-
 .../api/app/controllers/application_controller.rb  |    8 +
 .../app/controllers/arvados/v1/jobs_controller.rb  |   80 +-
 .../app/controllers/arvados/v1/users_controller.rb |   11 +
 services/api/app/models/arvados_model.rb           |   15 +-
 services/api/app/models/commit.rb                  |    8 +-
 services/api/app/models/job_task.rb                |   12 +-
 services/api/config/application.rb                 |    1 +
 .../20140709172343_job_task_serial_qsequence.rb    |   11 +
 services/api/db/schema.rb                          |  443 -----
 services/api/db/structure.sql                      | 1974 ++++++++++++++++++++
 services/api/lib/record_filters.rb                 |   27 +-
 .../test/fixtures/api_client_authorizations.yml    |    6 +
 services/api/test/fixtures/jobs.yml                |    2 +-
 services/api/test/fixtures/links.yml               |   28 +
 services/api/test/fixtures/pipeline_templates.yml  |    2 +-
 services/api/test/fixtures/users.yml               |   10 +
 .../arvados/v1/groups_controller_test.rb           |   77 +-
 .../arvados/v1/job_reuse_controller_test.rb        |   71 +
 .../functional/arvados/v1/users_controller_test.rb |  100 +
 services/api/test/integration/jobs_api_test.rb     |   19 +
 services/api/test/integration/permissions_test.rb  |   16 +-
 services/api/test/integration/select_test.rb       |    2 +-
 services/api/test/unit/job_task_test.rb            |   15 +-
 30 files changed, 2446 insertions(+), 552 deletions(-)
 create mode 100644 services/api/db/migrate/20140709172343_job_task_serial_qsequence.rb
 delete mode 100644 services/api/db/schema.rb
 create mode 100644 services/api/db/structure.sql

       via  36e6ade5a578f3f10e048ba545c4448a71137282 (commit)
       via  0218232df5c6b4e62cced85e17a512dd6cfcae36 (commit)
       via  4e1dda28351f6b7aa91aa6baca8805e283f2694b (commit)
       via  f85c6cf14fada8b2ad4b6b7e6e7e9cf9852ce83d (commit)
       via  29542968833ad233b21fc7fe2f86b1ba88334da2 (commit)
       via  5c5cb0a226a165c0028bb2c55cba8f4dcc359be1 (commit)
       via  ac97e7087df8b48ee289c696b47973618a40ce73 (commit)
       via  16bf6c2ad0f88183198701cc6242240f9b194a7b (commit)
       via  07f7373ef75ae9c574060e2a61c3749dc7c6ffe3 (commit)
       via  be6e47b1274d4b4e80afe51593222f99d90bac66 (commit)
       via  56303d3c734fa0ed9d5f077aac60b97596506efc (commit)
       via  1b4adbdc0711468971f619527cb250e8b743084b (commit)
       via  02de894919a054c31384aeda99a2c2de3a09ee60 (commit)
       via  5a3fcd947082b668f2d6941b88f0cf6399d4ad1e (commit)
      from  7daa6c8ccfc68ec189b42522fa1481b7c31174a8 (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 36e6ade5a578f3f10e048ba545c4448a71137282
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 15 10:48:14 2014 -0400

    3140: search in a tab should update results for that tab

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 01e740b..c44db5f 100644
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -62,4 +62,4 @@
   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, scroller: 'Data_collections'} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Data_collections'} %>
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 1db0d9f..f9e6306 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
@@ -5,4 +5,4 @@
   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, scroller: 'Jobs_and_pipelines'} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Jobs_and_pipelines'} %>
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 72b88d0..308034e 100644
--- a/apps/workbench/app/views/projects/_show_other_objects.html.erb
+++ b/apps/workbench/app/views/projects/_show_other_objects.html.erb
@@ -5,4 +5,4 @@
   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, scroller: 'Other_objects'} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Other_objects'} %>
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 6b0fe0b..c54e28d 100644
--- a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
+++ b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
@@ -5,4 +5,4 @@
   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, scroller: 'Pipeline_templates'} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Pipeline_templates'} %>
diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb
index aee9370..4497ca4 100644
--- a/apps/workbench/app/views/projects/_show_subprojects.html.erb
+++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb
@@ -5,4 +5,4 @@
   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, scroller: 'Subprojects'} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Subprojects'} %>
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 c40c9d8..36f1907 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -20,16 +20,16 @@
       </div>
     </div>
     <div class="col-sm-4 pull-right">
-      <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-contents tbody"/>
+      <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-<%= tab_name %> tbody"/>
     </div>
   </div>
 
-  <table class="table table-condensed table-fixedlayout arv-index arv-project-contents" style="overflow-x: hidden">
+  <table class="table table-condensed table-fixedlayout arv-index arv-project-<%= tab_name %>" style="overflow-x: hidden">
     <colgroup>
       <col width="40%" />
       <col width="60%" />
     </colgroup>
-    <tbody data-infinite-scroller="#<%=scroller%>-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: page_offset, filters: "#{filters}") if page_offset %>">
+    <tbody data-infinite-scroller="#<%= tab_name %>-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 0218232df5c6b4e62cced85e17a512dd6cfcae36
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 14 22:08:15 2014 -0400

    3140: use correct id for scroller

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 9198c65..01e740b 100644
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -62,4 +62,4 @@
   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} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, scroller: 'Data_collections'} %>
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 9b42452..1db0d9f 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
@@ -5,4 +5,4 @@
   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} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, scroller: 'Jobs_and_pipelines'} %>
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 3275ac7..72b88d0 100644
--- a/apps/workbench/app/views/projects/_show_other_objects.html.erb
+++ b/apps/workbench/app/views/projects/_show_other_objects.html.erb
@@ -5,4 +5,4 @@
   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} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, scroller: 'Other_objects'} %>
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 5497f12..6b0fe0b 100644
--- a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
+++ b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
@@ -5,4 +5,4 @@
   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} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, scroller: 'Pipeline_templates'} %>
diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb
index 6e93a4a..aee9370 100644
--- a/apps/workbench/app/views/projects/_show_subprojects.html.erb
+++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb
@@ -5,4 +5,4 @@
   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} %>
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, scroller: 'Subprojects'} %>
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 c123b29..c40c9d8 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="#<%=scroller%>-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 4e1dda28351f6b7aa91aa6baca8805e283f2694b
Merge: 7daa6c8 f85c6cf
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 14 21:46:20 2014 -0400

    Merge branch 'master' into 3140-project-content-tabs


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list