Merge branch '3052-crunch-log-stdout' closes #3052

[arvados.git] / apps / workbench / app / controllers / projects_controller.rb

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 46b8d159e8d84fafe2288c804a35d6ef9f9fe8c1..435e0cd5d68f9086a1cf83ea8d5377d360daedac 100644 (file)
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -1,4 +1,6 @@
 class ProjectsController < ApplicationController
+  before_filter :set_share_links, if: -> { defined? @object }
+
   def model_class
     Group
   end
@@ -26,7 +28,9 @@ class ProjectsController < ApplicationController
     else
       super
     end
+  end
 
+  def set_share_links
     @user_is_manager = false
     @share_links = []
     if @object.uuid != current_user.uuid
@@ -68,15 +72,13 @@ class ProjectsController < ApplicationController
         :filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]]
       }
     ]
-    # Note that adding :filters to 'Sharing' won't help show the count for it because @user_is_manager is only set in #show
-    # Therefore if a count were desired there we'd want to set @user_is_manager in a before_filter or somesuch.
     pane_list << { :name => 'Sharing',
                    :count => @share_links.count } if @user_is_manager
     pane_list << { :name => 'Advanced' }
   end
 
   # Called via AJAX and returns Javascript that populates tab counts into tab titles.
-  # References #show_pane_list action which should return an array of hashes each with :name 
+  # References #show_pane_list action which should return an array of hashes each with :name
   # and then optionally a :filters to run or a straight up :count
   #
   # This action could easily be moved to the ApplicationController to genericize the tab_counts behaviour,
@@ -125,8 +127,23 @@ 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
+          else
+            raise
+          end
+        end
       end
     end
   end