[ARVADOS] updated: 5b7762f1e6931c3e4e6ccd36d2a75ce53e38e36c

git at public.curoverse.com git at public.curoverse.com
Thu Aug 21 14:44:35 EDT 2014


Summary of changes:
 .../app/assets/javascripts/application.js          |   4 +-
 .../app/assets/javascripts/pipeline_instances.js   |  33 ++-
 apps/workbench/app/assets/javascripts/tab_panes.js |   1 +
 .../workbench/app/assets/stylesheets/jobs.css.scss |   2 +-
 .../app/assets/stylesheets/projects.css.scss       |   6 +
 .../app/controllers/collections_controller.rb      |  17 +-
 .../controllers/pipeline_instances_controller.rb   |   4 +-
 .../app/controllers/projects_controller.rb         |   2 +
 apps/workbench/app/helpers/application_helper.rb   |  20 +-
 apps/workbench/app/helpers/jobs_helper.rb          |  19 ++
 .../app/helpers/pipeline_instances_helper.rb       |  21 --
 apps/workbench/app/models/arvados_base.rb          |   2 +-
 apps/workbench/app/models/collection.rb            |  30 ++-
 .../views/application/_arvados_attr_value.html.erb |   6 +-
 .../application/_arvados_object_attr.html.erb      |   2 +-
 .../app/views/application/_show_recent.html.erb    |  14 +-
 apps/workbench/app/views/application/show.html.erb |   6 +-
 .../app/views/collections/_choose_rows.html.erb    |  18 ++
 .../app/views/collections/_index_tbody.html.erb    |   4 -
 .../app/views/collections/_show_files.html.erb     |   4 +-
 .../app/views/collections/_show_recent.html.erb    |   2 -
 .../app/views/collections/_toggle_persist.html.erb |   3 -
 apps/workbench/app/views/collections/show.html.erb |  33 ++-
 apps/workbench/app/views/jobs/_show_log.html.erb   |  25 +-
 apps/workbench/app/views/links/_recent.html.erb    |  57 -----
 .../pipeline_instances/_show_components.html.erb   |  16 +-
 .../_show_components_running.html.erb              |  63 +++---
 .../views/pipeline_instances/_show_log.html.erb    |   6 +
 .../views/projects/_show_contents_rows.html.erb    |  16 ++
 .../workbench/test/integration/collections_test.rb |  35 +--
 apps/workbench/test/integration/logins_test.rb     |   2 +
 .../test/integration/pipeline_instances_test.rb    |   4 +-
 doc/images/workbench-move-selected.png             | Bin 0 -> 11267 bytes
 .../create-standard-objects.html.textile.liquid    |  25 +-
 doc/install/install-api-server.html.textile.liquid |   8 +-
 .../getting_started/workbench.html.textile.liquid  |   2 +-
 doc/user/reference/api-tokens.html.textile.liquid  |   8 +-
 ...nning-pipeline-command-line.html.textile.liquid |   2 +-
 doc/user/topics/tutorial-job1.html.textile.liquid  |   4 +-
 .../tutorial-firstscript.html.textile.liquid       |   2 +-
 .../tutorials/tutorial-keep.html.textile.liquid    |   8 +-
 ...tutorial-pipeline-workbench.html.textile.liquid |  28 +--
 sdk/cli/bin/crunch-job                             |   5 +-
 sdk/python/arvados/api.py                          |   6 +-
 sdk/python/arvados/collection.py                   |  45 +++-
 sdk/python/arvados/commands/put.py                 |  21 +-
 sdk/python/arvados/config.py                       |   3 +
 sdk/python/arvados/keep.py                         | 251 +++++++++++++--------
 sdk/python/arvados/stream.py                       |   7 +-
 sdk/python/bin/arv-get                             |   7 +-
 sdk/python/tests/arvados_testutil.py               |  14 --
 sdk/python/tests/run_test_server.py                | 102 +++++++--
 sdk/python/tests/test_arv_put.py                   |  77 ++++---
 sdk/python/tests/test_collections.py               |  99 ++++----
 sdk/python/tests/test_keep_client.py               | 221 +++++++-----------
 sdk/python/tests/test_keep_locator.py              |  32 ++-
 sdk/python/tests/test_websockets.py                |   8 +-
 57 files changed, 805 insertions(+), 657 deletions(-)
 delete mode 100644 apps/workbench/app/views/collections/_toggle_persist.html.erb
 delete mode 100644 apps/workbench/app/views/links/_recent.html.erb
 create mode 100644 apps/workbench/app/views/pipeline_instances/_show_log.html.erb
 create mode 100644 doc/images/workbench-move-selected.png

       via  5b7762f1e6931c3e4e6ccd36d2a75ce53e38e36c (commit)
       via  6403b8728d3120d6cb22583b3963d2a030e88aa3 (commit)
       via  e8670f2a3e44458c963bb4b08a57d812a9b9d902 (commit)
       via  f16be1736d705278ae39bde3fc6d6d9d1f302fa7 (commit)
       via  897e6cc8175865575a809e9fcc6d40ea566ee930 (commit)
       via  7c78bea1fde0f581e31338e860ecb89ef91285d9 (commit)
       via  96fefe2373e7965311e1376dc0a54cf16ec9b415 (commit)
       via  c732e3d38ad324c46c43f9f3790ed7298eb392c2 (commit)
       via  e8566e29473ec12e3ceefbf87a87fac2b116e6d3 (commit)
       via  9beaaf14365459a028ca647488822f31bc2a26a9 (commit)
       via  cf9e77519d9955a2c8514e229dff099775d06af8 (commit)
       via  17f836f358b242798a34e34abb0ec4b12cdff1df (commit)
       via  8598092dfa7a5036417bba209a494c51812e9374 (commit)
       via  5d8e0b2caf01c6d78f7de20382742b6516697cd9 (commit)
       via  05bea2c50474edeb9d0e3fb8daaf838b58ea9a54 (commit)
       via  40d92dda0dd3e31cbfd5b887ea8465f9940b7540 (commit)
       via  3b9b5c14f6b1cd0cbed75e0d4adf36e10323dbe7 (commit)
       via  da01d7e185a6ce5e96d542c180856ce84e94ed63 (commit)
       via  e17db6aa8bae683f31d06500bbd78b043dce8d9a (commit)
       via  327e1768a130476a411baf4cd4fb602f7a73c5ed (commit)
       via  f05bc0963563ab50341ff042439462b631894de6 (commit)
       via  1afe2c7bbb571004736daf347f5178a27128704c (commit)
       via  f6e6e01802e09e1a108c067519d361caf0fc606f (commit)
       via  35a3223ee35279c04552d5d3d372998711a956ab (commit)
       via  1a2947bd5c35d58a347111ad8a9f4fc50aa1d6b3 (commit)
       via  57c56feabe58a4b49d0699c158086c13a5cdf023 (commit)
       via  33755fab93fb604a5e663089ece0fe6d3f690fe4 (commit)
       via  de3b2f9a31e7d6df9fb53fff149f5ee43d1664d0 (commit)
       via  e13874a4bb666423c5b2ddf1ebb517a10789f4c0 (commit)
       via  27697133a18371d692d69569659dd522e7b0fbdd (commit)
       via  289e5d15402d12ad02ac77e911aca7a32746c905 (commit)
       via  6db406e9a2fc78ed204460deb73151f44d94b030 (commit)
      from  b9eb04049c7740e8021a9810ed3adccb338d556b (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 5b7762f1e6931c3e4e6ccd36d2a75ce53e38e36c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 21 14:44:30 2014 -0400

    3036: Use preload_objects to fetch owner_uuids in the controller instead of in the view.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index a4925bd..1cc4966 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -170,6 +170,14 @@ class CollectionsController < ApplicationController
         .where(head_uuid: @object.uuid, link_class: 'name').results
       project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).to_hash
       @projects = project_hash.values
+
+      if @object.uuid.match /[0-9a-f]{32}/
+        @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]])
+        owners = @same_pdh.map {|s| s.owner_uuid}.to_a
+        preload_objects_for_dataclass Group, owners
+        preload_objects_for_dataclass User, owners
+      end
+
       @permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC")
         .where(head_uuid: @object.uuid, link_class: 'permission',
                name: 'can_read').results
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index cc19000..7d8ac4d 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -35,11 +35,11 @@
       </div>
       <div class="panel-body">
         <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
-        <% if @object.uuid.match /[0-9a-f]{32}/ %>
+        <% if defined? @same_pdh %>
           <p>Found in collections:<p>
           <p>
-            <% cols = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]]).each do |c| %>
-              <%= link_to_if_arvados_object c.owner_uuid, {:friendly_name => true} %> / <%= link_to_if_arvados_object c, {:friendly_name => true} %><br>
+            <% @same_pdh.each do |c| %>
+              <%= link_to_if_arvados_object get_object(c.owner_uuid), {:friendly_name => true} %> / <%= link_to_if_arvados_object c, {:friendly_name => true} %><br>
             <% end %>
           </p>
         <% else %>

commit 6403b8728d3120d6cb22583b3963d2a030e88aa3
Merge: b9eb040 e8670f2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 21 12:13:30 2014 -0400

    Merge remote-tracking branch 'refs/remotes/origin/3504-clients-compatible-with-3036' into 3036-collection-uuids
    
    Conflicts:
    	sdk/python/arvados/commands/put.py
    	sdk/python/tests/test_arv_put.py


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list