[ARVADOS] updated: 2bab50e5573bec3e46585fe23e2ffb26b1b8fe55

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/dates.js     |   3 +
 .../app/assets/stylesheets/application.css.scss    |  13 ++
 .../app/assets/stylesheets/projects.css.scss       |   9 +-
 .../app/controllers/application_controller.rb      |  24 +-
 .../app/controllers/projects_controller.rb         |  17 +-
 apps/workbench/app/helpers/application_helper.rb   |   4 +
 .../app/helpers/pipeline_instances_helper.rb       |  77 +++++--
 apps/workbench/app/models/job.rb                   |   4 +
 .../app/views/application/_content_layout.html.erb |  10 +-
 .../views/application/_job_status_label.html.erb   |   2 +-
 .../{show.html.erb => _title_and_buttons.html.erb} |  22 +-
 apps/workbench/app/views/application/show.html.erb |  71 +-----
 .../collections/_show_source_summary.html.erb      |   3 +-
 .../workbench/app/views/jobs/_show_status.html.erb | 110 ++-------
 apps/workbench/app/views/jobs/show.html.erb        |  32 +++
 ...unning.html.erb => _running_component.html.erb} | 105 ++-------
 .../_show_components_running.html.erb              | 252 ++++-----------------
 .../views/projects/_compute_node_status.html.erb   |  45 +++-
 .../views/projects/_compute_node_summary.html.erb  |  10 +-
 .../app/views/projects/_show_dashboard.html.erb    |  62 ++---
 .../test/integration/user_profile_test.rb          |   2 +-
 sdk/python/bin/arv-get                             |   6 +-
 services/keepstore/handlers.go                     |  18 +-
 23 files changed, 349 insertions(+), 552 deletions(-)
 copy apps/workbench/app/views/application/{show.html.erb => _title_and_buttons.html.erb} (76%)
 create mode 100644 apps/workbench/app/views/jobs/show.html.erb
 copy apps/workbench/app/views/pipeline_instances/{_show_components_running.html.erb => _running_component.html.erb} (68%)

       via  2bab50e5573bec3e46585fe23e2ffb26b1b8fe55 (commit)
       via  8c52fddd7b87b36bbd5cb0d362009df33ef5f0fc (commit)
       via  06a956718e8dd55a2cdd4a84fcdfb7a3b5a0f635 (commit)
       via  8c97b8ad6f4b026f8bd2626a6d1b76d2fc60f253 (commit)
       via  b25e164d6cfc0712be5856c63f7592145669232d (commit)
       via  9c7058321b88320594fccec767a8326e0bb9db4f (commit)
       via  92211c8bed5aaf3abd83d02c4adbaf2329123bac (commit)
       via  1d5d09e8d1568fdae039571306bd5e56a8273ac7 (commit)
       via  eec77d22e408fe3983cba666c6f5185ecf2d15ec (commit)
       via  4ea6cda50c7fcd3d30ac01e8a421cc68cd4ea23d (commit)
       via  5ef678825d7b436526489e9158a916b605814133 (commit)
       via  d2517f46eb0d1a668ac8124144220436c80d6f65 (commit)
       via  240ab2c50a01531df162850be255a4c4e1084fc2 (commit)
       via  d23d4ce9e4c52605cb23286b9e9b46a808f7437d (commit)
       via  5af4f00db1cbac83f52bf02b424968fd0ef387b1 (commit)
       via  104244f9ab68f409dbad2272910c21e317994a5d (commit)
       via  2e8aee62b13edd8eac34ac8536d41992c7adbf69 (commit)
       via  80ec2c7fe823b84ba5b3533f3c43d1bf3c627f70 (commit)
       via  aecc7109edd37aee2388c06a36d5c8ba853b3267 (commit)
       via  4eaf39dbe947beaaa87e656b470d7f21880ba607 (commit)
       via  15409c5e2b7946ff7f5fd104a6757a4d874448d4 (commit)
      from  eb8dc9dee0793139aac55f4aa65a7b2de433afea (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 2bab50e5573bec3e46585fe23e2ffb26b1b8fe55
Merge: 8c52fdd 06a9567
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 24 10:02:58 2014 -0400

    Merge branch 'master' into 3038-default-port-numbers


commit 8c52fddd7b87b36bbd5cb0d362009df33ef5f0fc
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 24 10:00:51 2014 -0400

    3038: if there is a unique constraint violation when a collection is removed from a project,
    which happens if there is already a collection with that same name in the Home project,
    rename the collection to ensure the removal process can complete.

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 323f2a1..2cbdcc9 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -127,8 +127,21 @@ class ProjectsController < ApplicationController
       if item.owner_uuid == @object.uuid
         # Object is owned by this project. Remove it from the project by
         # changing owner to the current user.
-        item.update_attributes owner_uuid: current_user.uuid
-        @removed_uuids << item.uuid
+        begin
+          item.update_attributes owner_uuid: current_user.uuid
+          @removed_uuids << item.uuid
+        rescue ArvadosApiClient::ApiErrorResponseException => e
+          if e.message.include? 'collection_owner_uuid_name_unique'
+            rename_to = item.name + ' removed from ' +
+                        (@object.name ? @object.name : @object.uuid) +
+                        ' at ' + Time.now.to_s
+            updates = {}
+            updates[:name] = rename_to
+            updates[:owner_uuid] = current_user.uuid
+            item.update_attributes updates
+            @removed_uuids << item.uuid
+          end
+        end
       end
     end
   end

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


hooks/post-receive
--