Merge branch '11235-log-retryable'

[arvados.git] / services / api / lib / whitelist_update.rb

diff --git a/services/api/lib/whitelist_update.rb b/services/api/lib/whitelist_update.rb
index 7413edf4bc902d0dc488c5ea2b3492792f6d338a..8fccd0f45c36416e72034a06e8e3ce3880f7aa04 100644 (file)
--- a/services/api/lib/whitelist_update.rb
+++ b/services/api/lib/whitelist_update.rb
@@ -2,7 +2,16 @@ module WhitelistUpdate
   def check_update_whitelist permitted_fields
     attribute_names.each do |field|
       if not permitted_fields.include? field.to_sym and self.send((field.to_s + "_changed?").to_sym)
-        errors.add field, "Illegal update of field #{field}"
+        errors.add field, "cannot be modified in this state"
+      end
+    end
+  end
+
+  def validate_state_change
+    if self.state_changed?
+      unless state_transitions[self.state_was].andand.include? self.state
+        errors.add :state, "cannot change from #{self.state_was} to #{self.state}"
+        return false
       end
     end
   end