[ARVADOS] updated: 4a78635a105b43bac10f2f14a4a549f2b05c8a5c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  4a78635a105b43bac10f2f14a4a549f2b05c8a5c (commit)
       via  aeec735ffb81feb118d082856ce4c737ed25e314 (commit)
      from  b22f6f25891fc9b97d07ef145cfa424f5c532aeb (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 4a78635a105b43bac10f2f14a4a549f2b05c8a5c
Merge: aeec735 b22f6f2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 26 17:10:26 2014 -0400

    Merge branch 'pete-fixes' of git.curoverse.com:arvados into pete-fixes


commit aeec735ffb81feb118d082856ce4c737ed25e314
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 26 17:09:57 2014 -0400

    Fixed get_n_objects_of_class datatype assertion for 'dataclass'

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 38ae911..e3f92ef 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -728,7 +728,7 @@ class ApplicationController < ActionController::Base
   def get_n_objects_of_class dataclass, size
     @objects_map_for ||= {}
 
-    raise ArgumentError, 'Argument is not a data class' unless dataclass.is_a? ArvadosBase
+    raise ArgumentError, 'Argument is not a data class' unless dataclass.is_a? Class and dataclass < ArvadosBase
     raise ArgumentError, 'Argument is not a valid limit size' unless (size && size>0)
 
     # if the objects_map_for has a value for this dataclass, and the

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


hooks/post-receive
--