projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19698: Merge branch 'main' into 19698-masked-error
[arvados.git]
/
services
/
api
/
lib
/
trashable.rb
diff --git
a/services/api/lib/trashable.rb
b/services/api/lib/trashable.rb
index 38ebaf7a8bfb5ca483c4b5b4df7d89585b5ff60c..c99b08513b64a57b046dccea7905ca032bd3b916 100644
(file)
--- a/
services/api/lib/trashable.rb
+++ b/
services/api/lib/trashable.rb
@@
-50,7
+50,7
@@
module Trashable
if trash_at.nil?
self.delete_at = nil
else
if trash_at.nil?
self.delete_at = nil
else
- self.delete_at = trash_at + Rails.configuration.
default_trash_l
ifetime.seconds
+ self.delete_at = trash_at + Rails.configuration.
Collections.DefaultTrashL
ifetime.seconds
end
elsif !trash_at || !delete_at || trash_at > delete_at
# Not trash, or bogus arguments? Just validate in
end
elsif !trash_at || !delete_at || trash_at > delete_at
# Not trash, or bogus arguments? Just validate in
@@
-65,7
+65,7
@@
module Trashable
earliest_delete = [
@validation_timestamp,
trash_at_was,
earliest_delete = [
@validation_timestamp,
trash_at_was,
- ].compact.min + Rails.configuration.
blob_signature_ttl.seconds
+ ].compact.min + Rails.configuration.
Collections.BlobSigningTTL
# The previous value of delete_at is also an upper bound on the
# longest-lived permission token. For example, if TTL=14,
# The previous value of delete_at is also an upper bound on the
# longest-lived permission token. For example, if TTL=14,
@@
-96,7
+96,7
@@
module TrashableController
@object.update_attributes!(trash_at: db_current_time)
end
earliest_delete = (@object.trash_at +
@object.update_attributes!(trash_at: db_current_time)
end
earliest_delete = (@object.trash_at +
- Rails.configuration.
blob_signature_ttl.seconds
)
+ Rails.configuration.
Collections.BlobSigningTTL
)
if @object.delete_at > earliest_delete
@object.update_attributes!(delete_at: earliest_delete)
end
if @object.delete_at > earliest_delete
@object.update_attributes!(delete_at: earliest_delete)
end
@@
-120,7
+120,7
@@
module TrashableController
@object.save!
end
else
@object.save!
end
else
- raise
InvalidStateTransitionError
+ raise
ArvadosModel::InvalidStateTransitionError.new("Item is not trashed, cannot untrash")
end
show
end
end
show
end