[ARVADOS] updated: bf52e46b544bf4c63d36cc824ed640d20a823686

[git at public.curoverse.com]

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

       via  bf52e46b544bf4c63d36cc824ed640d20a823686 (commit)
      from  89158222661a806cd27299054f6f50ee906d92e1 (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 bf52e46b544bf4c63d36cc824ed640d20a823686
Author: radhika <radhika at curoverse.com>
Date:   Wed Jul 30 16:02:25 2014 -0400

    2985: let error propagate during save

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index e3cdd55..9f2cfb0 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -70,7 +70,12 @@ class ActionsController < ApplicationController
           dst.owner_uuid = @object.uuid
           dst.tail_uuid = @object.uuid if dst.class == Link
         end
-        dst.save!
+        begin
+          dst.save!
+        rescue
+          dst.name += " (#{Time.now.localtime})" if dst.respond_to? :name=
+          dst.save!
+        end
       end
     end
     redirect_to @object
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index d243ef4..2b605d3 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -71,12 +71,7 @@ class ProjectsController < ApplicationController
           dst.owner_uuid = target_uuid
           dst.tail_uuid = target_uuid if dst.class == Link
         end
-        begin
-          dst.save!
-        rescue
-          dst.name += " (#{Time.now.localtime})" if dst.respond_to? :name=
-          dst.save!
-        end
+        dst.save!
       end
     end
     session[:selected_move_items] = nil

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


hooks/post-receive
--