[ARVADOS] updated: da8b7405a6d4c774ecdcaaec18ba57e3bb1e8249

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb  | 5 ++++-
 apps/workbench/app/controllers/projects_controller.rb | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

       via  da8b7405a6d4c774ecdcaaec18ba57e3bb1e8249 (commit)
       via  66e40806c2f117519c986d2cbedfca50a71d44bd (commit)
      from  e951b096aa97b51adf0a0bcf08688e1379efbdb3 (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 da8b7405a6d4c774ecdcaaec18ba57e3bb1e8249
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Aug 22 08:42:45 2014 -0400

    3504: Don't create stand-in "name" links for post #3036 apiserver

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 43440fe..0b14679 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -239,7 +239,7 @@ class ProjectsController < ApplicationController
         objects_and_names << [object, @name_link_for[object.uuid]]
       elsif object.respond_to? :name
         objects_and_names << [object, object]
-      else
+      elsif not Collection.attribute_info.include?(:name)
         objects_and_names << [object,
                                Link.new(owner_uuid: @object.uuid,
                                         tail_uuid: @object.uuid,

commit 66e40806c2f117519c986d2cbedfca50a71d44bd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 21 17:10:45 2014 -0400

    3504: Support copy and moving collections on new apiserver

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 265cff4..fd4ebc4 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -48,7 +48,7 @@ class ActionsController < ApplicationController
       uniq.
       each do |resource_class|
       resource_class.filter([['uuid','in',uuids_to_add]]).each do |src|
-        if resource_class == Collection
+        if resource_class == Collection and not Collection.attribute_info.include?(:name)
           dst = Link.new(owner_uuid: @object.uuid,
                          tail_uuid: @object.uuid,
                          head_uuid: src.uuid,
@@ -65,6 +65,9 @@ class ActionsController < ApplicationController
                 dst.name = "Copy of unnamed #{dst.class_for_display.downcase}"
               end
             end
+            if resource_class == Collection
+              dst.manifest_text = Collection.select([:manifest_text]).where(uuid: src.uuid).first.manifest_text
+            end
           when :move
             dst = src
           else
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index d9ec0a6..43440fe 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -86,7 +86,7 @@ class ProjectsController < ApplicationController
       uniq.
       each do |resource_class|
       resource_class.filter([['uuid','in',uuids_to_add]]).each do |dst|
-        if resource_class == Collection
+        if resource_class == Collection and not Collection.attribute_info.include?(:name)
           dst = Link.new(owner_uuid: target_uuid,
                          tail_uuid: target_uuid,
                          head_uuid: dst.uuid,

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


hooks/post-receive
--