Skip to content

Commit faf395c

Browse files
committed
addGlobalError
1 parent 2402ccd commit faf395c

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

api/src/org/labkey/api/data/AbstractTableInfo.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,13 +2051,19 @@ public void fireRowTrigger(
20512051

20522052
String message = "Trigger '" + script.getName() + "' attempted to " + String.join(", ", diffs) + ". Declare managed columns to include them in the column set.";
20532053
if (manageColumns)
2054+
{
20542055
errors.addGlobalError(message);
2055-
else
2056-
LOG.warn(message + " This will be an error if invoked via data iteration.");
2056+
break;
2057+
}
2058+
2059+
LOG.warn(message + " This will be an error if invoked via data iteration.");
20572060
}
20582061
}
20592062

2060-
// Verify the trigger handles every managed column
2063+
if (errors.hasErrors())
2064+
break;
2065+
2066+
// Verify the trigger handles all managed columns
20612067
if (managedCols != null)
20622068
{
20632069
for (var col : managedCols)
@@ -2066,9 +2072,13 @@ public void fireRowTrigger(
20662072
{
20672073
String message = "Trigger '" + script.getName() + "' declared the managed column '" + col + "' but did not set a value for it. Set null to clear or provide a value.";
20682074
if (manageColumns)
2069-
errors.addFieldError(col, message);
2070-
else
2071-
LOG.warn(message + " This will be an error if invoked via data iteration.");
2075+
{
2076+
// Not using errors.addFieldError() here as the managed column may not be visible
2077+
errors.addGlobalError(message);
2078+
break;
2079+
}
2080+
2081+
LOG.warn(message + " This will be an error if invoked via data iteration.");
20722082
}
20732083
}
20742084
}

0 commit comments

Comments
 (0)