Skip to content

GH Issue 1477: Enforce required comments for sample type import template updates #8006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-susanh merged 6 commits into from
Sep 2, 2026
Merged

GH Issue 1477: Enforce required comments for sample type import template updates #8006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9641a95
GH Issue 1477: Enforce required comments for sample type import templ…
labkey-susanh Sep 1, 2026
37b382a
Update container check
labkey-susanh Sep 1, 2026
ee969e9
CRLF updates
labkey-susanh Sep 1, 2026
eade561
Move container reconciliation into getAuditCommentsRequired
labkey-susanh Sep 1, 2026
ad719e5
Merge remote-tracking branch 'origin/develop' into fb_manageTemplates…
labkey-susanh Sep 2, 2026
602de95
Merge remote-tracking branch 'origin/develop' into fb_manageTemplates…
labkey-susanh Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion api/src/org/labkey/api/data/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,9 +1033,13 @@ public FolderType getFolderType()
@NotNull
public Boolean getAuditCommentsRequired()
{
Map<String, String> props = PropertyManager.getProperties(this, AUDIT_SETTINGS_PROPERTY_SET_NAME);
if (!ProductRegistry.isProductFeatureEnabled(ProductFeature.DataChangeCommentRequirement))
return false;
// the audit setting is stored on the app home folder, which is the project only when product folders are enabled
Container container = isAppHomeFolder() ? this : getProject();
if (container == null) // shouldn't ever happen
return false;
Map<String, String> props = PropertyManager.getProperties(container, AUDIT_SETTINGS_PROPERTY_SET_NAME);
return Boolean.parseBoolean(props.getOrDefault(REQUIRE_USER_COMMENTS_PROPERTY_NAME, "false"));
}

Expand Down
5 changes: 4 additions & 1 deletion query/src/org/labkey/query/controllers/QueryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5002,7 +5002,7 @@ public void validateForm(MoveRowsForm form, Errors errors)
else
{
// Since we are moving between containers, we know we have product folders enabled
if (getContainer().getProject().getAuditCommentsRequired() && StringUtils.isBlank(json.optString("auditUserComment")))
if (getContainer().getAuditCommentsRequired() && StringUtils.isBlank(json.optString("auditUserComment")))
errors.reject(ERROR_GENERIC, "A reason for the move of data is required.");
else
{
Expand Down Expand Up @@ -8101,6 +8101,9 @@ public void validateForm(QueryImportTemplateForm form, Errors errors)
{
User user = getUser();
Container container = getContainer();

if (container != null && container.getAuditCommentsRequired() && StringUtils.isBlank(form.getAuditUserComment()))
errors.reject(ERROR_GENERIC, "A reason for the template update is required.");
String domainURI = PropertyService.get().getDomainURI(form.getSchemaName(), form.getQueryName(), container, user);
_kind = PropertyService.get().getDomainKind(domainURI);
_domain = PropertyService.get().getDomain(container, domainURI);
Expand Down