projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
746240c
)
Always accept properties and info as serialized attributes.
author
Tom Clegg <tom@curoverse.com>
Fri, 24 Jan 2014 16:36:00 +0000
(08:36 -0800)
committer
Tom Clegg <tom@curoverse.com>
Fri, 24 Jan 2014 16:46:57 +0000
(08:46 -0800)
refs #1944
refs #1987
services/api/app/controllers/application_controller.rb
patch
|
blob
|
history
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index a11a75fa9b96df2e540d2c20c99e5fac6fb11e8a..62ed762a41ded5ca550f8dc8372c55d69dad03c5 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-339,6
+339,8
@@
class ApplicationController < ActionController::Base
def self.accept_attribute_as_json(attr, force_class=nil)
before_filter lambda { accept_attribute_as_json attr, force_class }
end
+ accept_attribute_as_json :properties, Hash
+ accept_attribute_as_json :info, Hash
def accept_attribute_as_json(attr, force_class)
if params[resource_name] and resource_attrs.is_a? Hash
if resource_attrs[attr].is_a? String