show error message when item type does not match protocol

dshao · dshao · commit 4fca2e4175a7 · 2021-12-01T17:15:45.000-05:00
diff --git a/pegr/grails-app/controllers/pegr/ProtocolInstanceBagController.groovy b/pegr/grails-app/controllers/pegr/ProtocolInstanceBagController.groovy
@@ -279,7 +279,7 @@ class ProtocolInstanceBagController {
         } else {
             def item = Item.findByBarcode(barcode)
             if (item && item.type != itemType) {
-                flash.message = "The item with barcode ${barcode} has type ${item.type}, which does not match the input type ${itemType}!"
+                flash.message = "The item with barcode ${barcode} has type ${item.type.name}, which does not match the input type ${itemType.name}!"
                 redirect(action: "showInstance", id: instanceId)
                 return
             }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ class ProtocolInstanceBagController {`
`279`	`279`	`} else {`
`280`	`280`	`def item = Item.findByBarcode(barcode)`
`281`	`281`	`if (item && item.type != itemType) {`
`282`		`- flash.message = "The item with barcode ${barcode} has type ${item.type}, which does not match the input type ${itemType}!"`
	`282`	`+ flash.message = "The item with barcode ${barcode} has type ${item.type.name}, which does not match the input type ${itemType.name}!"`
`283`	`283`	`redirect(action: "showInstance", id: instanceId)`
`284`	`284`	`return`
`285`	`285`	`}`