[ARVADOS] updated: 3bdb80dfd5dee326bf66f5025997cce5aca6cbff

[Git user]

Summary of changes:
 apps/workbench/app/controllers/container_requests_controller.rb | 7 ++++++-
 apps/workbench/app/helpers/application_helper.rb                | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

       via  3bdb80dfd5dee326bf66f5025997cce5aca6cbff (commit)
       via  b7e7c0861ed70524e8aff0aa82a35a887619dff8 (commit)
      from  241a1049be1eb101723a3714125eef8baa3c33dc (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 3bdb80dfd5dee326bf66f5025997cce5aca6cbff
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 25 12:59:12 2016 -0400

    9043: Handle errors on when trying to commit container.

diff --git a/apps/workbench/app/controllers/container_requests_controller.rb b/apps/workbench/app/controllers/container_requests_controller.rb
index 54e5914..14685d6 100644
--- a/apps/workbench/app/controllers/container_requests_controller.rb
+++ b/apps/workbench/app/controllers/container_requests_controller.rb
@@ -51,7 +51,12 @@ class ContainerRequestsController < ApplicationController
       end
     end
     params[:merge] = true
-    super
+    begin
+      super
+    rescue => e
+      flash[:error] = e.to_s
+      show
+    end
   end
 
 end

commit b7e7c0861ed70524e8aff0aa82a35a887619dff8
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Aug 25 12:58:32 2016 -0400

    9043: Use match_uuid_with_optional_filepath instead of hardcoded uuid regex.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index ec2e93f..e5bc0bf 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -466,9 +466,10 @@ module ApplicationHelper
       selection_param = object.class.to_s.underscore + dn
       if attrvalue.is_a? Hash
         display_value = attrvalue[:"arv:collection"] || attrvalue[:location]
-        display_value.match /^([0-9a-z]{5}-([0-9a-z]{5})-[0-9a-z]{15})(\/.*)?$/ do |re|
-          if re[3]
-            display_value = "#{Collection.find(re[1]).name} / #{re[3][1..-1]}"
+        re = CollectionsHelper.match_uuid_with_optional_filepath(display_value)
+        if re
+          if re[4]
+            display_value = "#{Collection.find(re[1]).name} / #{re[4][1..-1]}"
           else
             display_value = Collection.find(re[1]).name
           end

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


hooks/post-receive
--