projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20300: Mark belongs_to relations as optional.
[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 d910320ec0f56a6bdbc14572d82249a36039f9bb..c909e47cef7ff10e4e4b01cc5221713c7d78a542 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-145,7
+145,7
@@
class ArvadosModel < ApplicationRecord
super(permit_attribute_params(raw_params), *args)
end
super(permit_attribute_params(raw_params), *args)
end
- def update
_attributes
raw_params={}, *args
+ def update raw_params={}, *args
super(self.class.permit_attribute_params(raw_params), *args)
end
super(self.class.permit_attribute_params(raw_params), *args)
end
@@
-464,6
+464,7
@@
class ArvadosModel < ApplicationRecord
end
end
end
end
+ return self if sql_conds == nil
self.where(sql_conds,
user_uuids: all_user_uuids.collect{|c| c["target_uuid"]},
permission_link_classes: ['permission'])
self.where(sql_conds,
user_uuids: all_user_uuids.collect{|c| c["target_uuid"]},
permission_link_classes: ['permission'])
@@
-938,8
+939,6
@@
class ArvadosModel < ApplicationRecord
# hook.
def fill_container_defaults_after_find
fill_container_defaults
# hook.
def fill_container_defaults_after_find
fill_container_defaults
- set_attribute_was('runtime_constraints', runtime_constraints)
- set_attribute_was('scheduling_parameters', scheduling_parameters)
clear_changes_information
end
clear_changes_information
end