3605: Dashboard compute node and pipeline status work in progress

[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 7b02206d22a8277408d52b1441c8949a9d4325a6..1e06b0a9ea6b3c46778b9bcfc7e7ec29bff42a09 100644 (file)
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -77,21 +77,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def copy_items
-    move_or_copy_project_items :copy
-  end
-
-  def move_items
-    move_or_copy_project_items :move
-  end
-
-  def move_or_copy_project_items action
-    uuids_to_add = session[:selected_move_or_copy_items]
-    move_or_copy_items action, uuids_to_add, params['target']
-    session[:selected_move_or_copy_items] = nil
-    redirect_to @object
-  end
-
   def destroy
     while (objects = Link.filter([['owner_uuid','=',@object.uuid],
                                   ['tail_uuid','=',@object.uuid]])).any?
@@ -228,13 +213,14 @@ class ProjectsController < ApplicationController
         objects_and_names << [object, @name_link_for[object.uuid]]
       elsif object.respond_to? :name
         objects_and_names << [object, object]
-      elsif not Collection.attribute_info.include?(:name)
+      else
         objects_and_names << [object,
                                Link.new(owner_uuid: @object.uuid,
                                         tail_uuid: @object.uuid,
                                         head_uuid: object.uuid,
                                         link_class: "name",
                                         name: "")]
+
       end
     end
     objects_and_names