12125: Can browse trashed projects & untrash them.

[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 c010123ea09a4615050778b65963632a20b56321..a2ed89bb92b69a1c2231e10927c0943c5096c63e 100644 (file)
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -134,50 +134,8 @@ class ProjectsController < ApplicationController
     @removed_uuids = []
     links = []
     params[:item_uuids].collect { |uuid| ArvadosBase.find uuid }.each do |item|
-      if (item.class == Link and
-          item.link_class == 'name' and
-          item.tail_uuid == @object.uuid)
-        # Given uuid is a name link, linking an object to this
-        # project. First follow the link to find the item we're removing,
-        # then delete the link.
-        links << item
-        item = ArvadosBase.find item.head_uuid
-      else
-        # Given uuid is an object. Delete all names.
-        links += Link.where(tail_uuid: @object.uuid,
-                            head_uuid: item.uuid,
-                            link_class: 'name')
-      end
-      links.each do |link|
-        @removed_uuids << link.uuid
-        link.destroy
-      end
-
-      if item.class == Collection
-        # Use delete API on collections
-        item.destroy
-        @removed_uuids << item.uuid
-      elsif item.owner_uuid == @object.uuid
-        # Object is owned by this project. Remove it from the project by
-        # changing owner to the current user.
-        begin
-          item.update_attributes owner_uuid: current_user.uuid
-          @removed_uuids << item.uuid
-        rescue ArvadosApiClient::ApiErrorResponseException => e
-          if e.message.include? '_owner_uuid_'
-            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
+      item.destroy
+      @removed_uuids << item.uuid
     end
   end
 
@@ -337,7 +295,7 @@ class ProjectsController < ApplicationController
   def public  # Yes 'public' is the name of the action for public projects
     return render_not_found if not Rails.configuration.anonymous_user_token or not Rails.configuration.enable_public_projects_page
     @objects = using_specific_api_token Rails.configuration.anonymous_user_token do
-      Group.where(group_class: 'project').order("updated_at DESC")
+      Group.where(group_class: 'project').order("modified_at DESC")
     end
   end
 end