From c1ca67dd62a4d566e54815b7fcf1d0e7ffdc93ee Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 26 May 2025 11:36:44 -0700 Subject: [PATCH 1/3] Add forUpdate parameter to more methods that are getting domains --- .../org/labkey/wnprc_purchasing/WNPRC_PurchasingManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingManager.java b/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingManager.java index dd2b4b8d6..c01a19a7b 100644 --- a/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingManager.java +++ b/WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingManager.java @@ -399,7 +399,7 @@ private void addPurchasingRequestsCols(Container container, User user) domain.setFields(extensibleCols); try { - DomainUtil.createDomain(DOMAIN_NAME, domain, null, container, user, null, null); + DomainUtil.createDomain(DOMAIN_NAME, domain, null, container, user, null, null, false); } catch (ValidationException ve) { throw new RuntimeException(ve.getMessage(), ve); From 1b063dacb0ae1797b39beeb79a9f4742fc4340a0 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 26 May 2025 15:37:47 -0700 Subject: [PATCH 2/3] More forUpdate parameters and make methods for data classes and sample types more similar --- .../labkey/selfregistration/SelfRegistrationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationController.java b/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationController.java index 832d90471..cdba3da07 100644 --- a/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationController.java +++ b/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationController.java @@ -326,7 +326,7 @@ public static void setUp() throws ValidEmail.InvalidEmailException, ChangeProper // create issue tracker int issueDefId = IssuesListDefService.get().createIssueListDef(container, adminUser,"IssueDefinition","User Registrations", null,null); // The Domain object is the definition of the "table" that contains the custom fields. - Domain d = IssuesListDefService.get().getDomainFromIssueDefId(issueDefId, container, adminUser); + Domain d = IssuesListDefService.get().getDomainFromIssueDefId(issueDefId, container, adminUser, true); String[] fieldnames = {"firstname","lastname","email","institution","project","reason"}; createTextFields(d,fieldnames,adminUser); @@ -385,4 +385,4 @@ public static void cleanUp() throws ValidEmail.InvalidEmailException, SecurityMa UserManager.deleteUser(adminuser.getUserId()); } } -} \ No newline at end of file +} From a38aed6c8c11dbbe074df52e4abbf8d211d7ebcd Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 28 May 2025 10:42:35 -0700 Subject: [PATCH 3/3] Still more forUpdate parameters --- .../org/labkey/dbutils/api/schema/DecoratedTableInfo.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java index 2c927e759..782a112df 100644 --- a/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java +++ b/DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java @@ -365,6 +365,13 @@ public Domain getDomain() { return _tableInfo.getDomain(); } + @Nullable + @Override + public Domain getDomain(boolean forUpdate) { + return _tableInfo.getDomain(forUpdate); + } + + @Nullable @Override public DomainKind getDomainKind() {