projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9709: Restore logging of manifest_text by default, add config option to omit it.
[arvados.git]
/
services
/
api
/
app
/
models
/
arvados_model.rb
diff --git
a/services/api/app/models/arvados_model.rb
b/services/api/app/models/arvados_model.rb
index a6672c4b3c1e992c20c680bdcfe1a17493fb71f8..c663d21d5293bfd816140807a0bf57e34054d984 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-243,7
+243,7
@@
class ArvadosModel < ActiveRecord::Base
end
def logged_attributes
end
def logged_attributes
- attributes
+ attributes
.except *Rails.configuration.unlogged_attributes
end
def self.full_text_searchable_columns
end
def self.full_text_searchable_columns
@@
-408,15
+408,16
@@
class ArvadosModel < ActiveRecord::Base
x.each do |k,v|
return true if has_symbols?(k) or has_symbols?(v)
end
x.each do |k,v|
return true if has_symbols?(k) or has_symbols?(v)
end
- false
elsif x.is_a? Array
x.each do |k|
return true if has_symbols?(k)
end
elsif x.is_a? Array
x.each do |k|
return true if has_symbols?(k)
end
- false
- else
- (x.class == Symbol)
+ elsif x.is_a? Symbol
+ return true
+ elsif x.is_a? String
+ return true if x.start_with?(':') && !x.start_with?('::')
end
end
+ false
end
def self.recursive_stringify x
end
def self.recursive_stringify x
@@
-430,6
+431,8
@@
class ArvadosModel < ActiveRecord::Base
end
elsif x.is_a? Symbol
x.to_s
end
elsif x.is_a? Symbol
x.to_s
+ elsif x.is_a? String and x.start_with?(':') and !x.start_with?('::')
+ x[1..-1]
else
x
end
else
x
end