Merge branch 'staging' into rails_upgrade

2019-10-28 09:30:05 -05:00 · 2019-10-28 09:30:05 -05:00 · 5d81693e5a
parent a4c544d651 f49f84d82d
commit 5d81693e5a
1 changed files with 3 additions and 1 deletions
--- a/app/models/tool_slot.rb
+++ b/app/models/tool_slot.rb
@ -11,7 +11,9 @@ class ToolSlot < Point
  MIN_PULLOUT = PULLOUT_DIRECTIONS.min
  PULLOUT_ERR = "must be a value between #{MIN_PULLOUT} and #{MAX_PULLOUT}. "\
                "%{value} is not valid."
-  IN_USE      = "already in use by another tool slot"
+  IN_USE      = "already in use by another tool slot. "\
+                "Please un-assign the tool from its current slot"\
+                " before reassigning."

  belongs_to :tool
  validates_uniqueness_of :tool,