10538: Clarify error message.
authorTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 18:39:07 +0000 (13:39 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 18:39:07 +0000 (13:39 -0500)
services/api/app/models/collection.rb

index 572a71756795148bccf3942baa8c8aaf2d1964d3..4f774d6f9cc7029759a474938da991cbc83c2f46 100644 (file)
@@ -465,7 +465,7 @@ class Collection < ArvadosModel
 
   def validate_trash_and_delete_timing
     if trash_at.nil? != delete_at.nil?
-      errors.add :delete_at, "must be nil if and only if trash_at is nil"
+      errors.add :delete_at, "must be set if trash_at is set, and must be nil otherwise"
     end
 
     earliest_delete = ([@validation_timestamp, trash_at_was].compact.min +