projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19269-all-users-writable'
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
containers_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/containers_controller.rb
b/services/api/app/controllers/arvados/v1/containers_controller.rb
index fc5614d9446e014a9b32fea548d33e53d57a6571..041f55947229d4d6d802de348e5561dce313c96e 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/containers_controller.rb
@@
-30,7
+30,6
@@
class Arvados::V1::ContainersController < ApplicationController
def update
@object.with_lock do
def update
@object.with_lock do
- @object.reload
super
end
end
super
end
end
@@
-39,7
+38,7
@@
class Arvados::V1::ContainersController < ApplicationController
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
super
if action_name == 'lock' || action_name == 'unlock'
# Avoid loading more fields than we need
- @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid)
+ @objects = @objects.select(:id, :uuid, :state, :priority, :auth_uuid, :locked_by_uuid
, :lock_count
)
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end
@select = %w(uuid state priority auth_uuid locked_by_uuid)
end
end