Allow MCC properties to be set per-container to facilitate automated tests

bbimber · bbimber · commit 1deb3b80891e · 2022-12-02T14:56:39.000-08:00
diff --git a/mcc/src/org/labkey/mcc/MccController.java b/mcc/src/org/labkey/mcc/MccController.java
@@ -108,7 +108,7 @@ public class RequestUserAction extends MutatingApiAction<RequestUserForm>
         @Override
         public void validateForm(RequestUserForm form, Errors errors)
         {
-            Container mccContainer = MccManager.get().getMCCContainer();
+            Container mccContainer = MccManager.get().getMCCContainer(getContainer());
             if (mccContainer == null)
             {
                 errors.reject(ERROR_MSG, "The MCC project has not been set on this server.  This is an administrator error.");
@@ -165,17 +165,17 @@ public Object execute(RequestUserForm form, BindException errors) throws Excepti
                 row.put("title", form.getTitle());
                 row.put("institution", form.getInstitution());
                 row.put("reason", form.getReason());
-                row.put("container", MccManager.get().getMCCContainer().getId());
+                row.put("container", MccManager.get().getMCCContainer(getContainer()).getId());
 
                 Table.insert(UserManager.getGuestUser(), ti, row);
 
-                Set<Address> emails = MccManager.get().getNotificationUserEmails();
+                Set<Address> emails = MccManager.get().getNotificationUserEmails(getContainer());
                 if (emails != null && !emails.isEmpty())
                 {
                     try
                     {
                         MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();
-                        Container c = MccManager.get().getMCCContainer();
+                        Container c = MccManager.get().getMCCContainer(getContainer());
                         if (c == null)
                         {
                             c = getContainer();
@@ -299,7 +299,7 @@ public class ApproveUserRequestsAction extends MutatingApiAction<ApproveUserRequ
         @Override
         public void validateForm(ApproveUserRequestsForm form, Errors errors)
         {
-            Container mccContainer = MccManager.get().getMCCContainer();
+            Container mccContainer = MccManager.get().getMCCContainer(getContainer());
             if (mccContainer == null)
             {
                 errors.reject(ERROR_MSG, "The MCC project has not been set on this server.  This is an administrator error.");
@@ -390,7 +390,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
                 allUsers.add(st.getUser());
             }
 
-            Container mccContainer = MccManager.get().getMCCContainer();
+            Container mccContainer = MccManager.get().getMCCContainer(getContainer());
             for (User u : existingUsersGivenAccess)
             {
                 boolean isLDAP = AuthenticationManager.isLdapEmail(new ValidEmail(u.getEmail()));
@@ -460,7 +460,7 @@ public class RequestHelpAction extends MutatingApiAction<RequestHelpForm>
         @Override
         public void validateForm(RequestHelpForm form, Errors errors)
         {
-            Container mccContainer = MccManager.get().getMCCContainer();
+            Container mccContainer = MccManager.get().getMCCContainer(getContainer());
             if (mccContainer == null)
             {
                 errors.reject(ERROR_MSG, "The MCC project has not been set on this server.  This is an administrator error.");
@@ -487,7 +487,7 @@ public void validateForm(RequestHelpForm form, Errors errors)
         @Override
         public Object execute(RequestHelpForm form, BindException errors) throws Exception
         {
-            Set<Address> emails = MccManager.get().getNotificationUserEmails();
+            Set<Address> emails = MccManager.get().getNotificationUserEmails(getContainer());
             if (emails != null && !emails.isEmpty())
             {
                 try
@@ -568,7 +568,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception
             }
 
             // Ensure groups have target roles:
-            Container requestContainer = MccManager.get().getMCCRequestContainer();
+            Container requestContainer = MccManager.get().getMCCRequestContainer(getContainer());
             if (requestContainer != null)
             {
                 Group requestGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME, GroupEnumType.SITE);
@@ -604,7 +604,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception
                 }
             }
 
-            Container dataContainer = MccManager.get().getMCCContainer();
+            Container dataContainer = MccManager.get().getMCCContainer(getContainer());
             if (dataContainer != null)
             {
                 Group adminGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.ADMIN_GROUP_NAME, GroupEnumType.SITE);
@@ -622,13 +622,13 @@ public boolean handlePost(Object o, BindException errors) throws Exception
         @Override
         public void validateCommand(Object o, Errors errors)
         {
-            Container mccContainer = MccManager.get().getMCCContainer();
+            Container mccContainer = MccManager.get().getMCCContainer(getContainer());
             if (mccContainer == null)
             {
                 errors.reject(ERROR_MSG, "The MCC data container property has not been set");
             }
 
-            Container requestContainer = MccManager.get().getMCCRequestContainer();
+            Container requestContainer = MccManager.get().getMCCRequestContainer(getContainer());
             if (requestContainer == null)
             {
                 errors.reject(ERROR_MSG, "The MCC request container property has not been set");
@@ -760,7 +760,7 @@ public Object execute(NotifyReviewersForm form, BindException errors) throws Exc
                 mail.setFrom("mcc-do-not-reply@ohsu.edu");
                 mail.setSubject("MCC Animal Request Reviews");
 
-                Container rc = MccManager.get().getMCCRequestContainer();
+                Container rc = MccManager.get().getMCCRequestContainer(getContainer());
                 DetailsURL url = DetailsURL.fromString("/mcc/rabRequestReview.view", rc);
                 mail.setEncodedHtmlContent("You have been assigned one or more MCC Animal Requests to review. <a href=\"" + AppProps.getInstance().getBaseServerUrl() + url.getActionURL() + "\">Please click here to view and complete these assignments</a>");
                 mail.addRecipients(Message.RecipientType.BCC, emails.toArray(new Address[0]));
diff --git a/mcc/src/org/labkey/mcc/MccMaintenanceTask.java b/mcc/src/org/labkey/mcc/MccMaintenanceTask.java
@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.labkey.api.data.Container;
+import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.ldk.LDKService;
@@ -37,7 +38,7 @@ public void run(Logger log)
 
     private void checkForDuplicateAliases(Logger log)
     {
-        Container studyParent = MccManager.get().getMCCInternalDataContainer();
+        Container studyParent = MccManager.get().getMCCInternalDataContainer(ContainerManager.getRoot());
         if (studyParent == null)
         {
             return;
diff --git a/mcc/src/org/labkey/mcc/MccManager.java b/mcc/src/org/labkey/mcc/MccManager.java
@@ -128,11 +128,11 @@ public static MccManager get()
         return _instance;
     }
 
-    public Container getMCCRequestContainer()
+    public Container getMCCRequestContainer(Container c)
     {
         Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
         ModuleProperty mp = m.getModuleProperties().get(MccManager.MCCRequestContainer);
-        String path = mp.getEffectiveValue(ContainerManager.getRoot());
+        String path = mp.getEffectiveValue(c);
         if (path == null)
             return null;
 
@@ -144,31 +144,31 @@ public String getMccAdminEmail()
         return "mcc@ohsu.edu";
     }
 
-    public Container getMCCInternalDataContainer()
+    public Container getMCCInternalDataContainer(Container c)
     {
         Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
         ModuleProperty mp = m.getModuleProperties().get(MccManager.MCCInternalDataContainerPropName);
-        String path = mp.getEffectiveValue(ContainerManager.getRoot());
+        String path = mp.getEffectiveValue(c);
         if (path == null)
             return null;
 
         return ContainerManager.getForPath(path);
     }
 
-    public Container getMCCContainer()
+    public Container getMCCContainer(Container c)
     {
         Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
         ModuleProperty mp = m.getModuleProperties().get(MccManager.ContainerPropName);
-        String path = mp.getEffectiveValue(ContainerManager.getRoot());
+        String path = mp.getEffectiveValue(c);
         if (path == null)
             return null;
 
         return ContainerManager.getForPath(path);
     }
 
-    public boolean isRequestAdmin(User u)
+    public boolean isRequestAdmin(User u, Container container)
     {
-        Container c = getMCCRequestContainer();
+        Container c = getMCCRequestContainer(container);
         if (c == null)
         {
             _log.error("MccManager.isRequestAdmin called, but MCCRequestContainer has not been set");
@@ -191,21 +191,21 @@ public File getZimsImportFolder(Container c)
         return new File(val);
     }
 
-    public Set<Address> getNotificationUserEmails()
+    public Set<Address> getNotificationUserEmails(Container c)
     {
-        return getUserEmailsForProp(MccManager.NotifyPropName);
+        return getUserEmailsForProp(MccManager.NotifyPropName, c);
     }
 
-    public Set<Address> getRequestNotificationUserEmails()
+    public Set<Address> getRequestNotificationUserEmails(Container c)
     {
-        return getUserEmailsForProp(MccManager.MCCRequestNotificationUsers);
+        return getUserEmailsForProp(MccManager.MCCRequestNotificationUsers, c);
     }
 
-    private Set<Address> getUserEmailsForProp(String propName)
+    private Set<Address> getUserEmailsForProp(String propName, Container c)
     {
         Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);
         ModuleProperty mp = m.getModuleProperties().get(propName);
-        String userNames = mp.getEffectiveValue(ContainerManager.getRoot());
+        String userNames = mp.getEffectiveValue(c);
         userNames = StringUtils.trimToNull(userNames);
         if (userNames == null)
             return null;
@@ -227,7 +227,7 @@ private Set<Address> getUserEmailsForProp(String propName)
             }
             else
             {
-                UserPrincipal up = SecurityManager.getPrincipal(principalName, getMCCContainer(), true);
+                UserPrincipal up = SecurityManager.getPrincipal(principalName, getMCCContainer(c), true);
                 if (up == null)
                 {
                     _log.error("Unknown user/group registered for MCC notifications: [" + principalName + "]", new Exception());
diff --git a/mcc/src/org/labkey/mcc/MccModule.java b/mcc/src/org/labkey/mcc/MccModule.java
@@ -92,7 +92,7 @@ public JSONObject getPageContextJson(ContainerUser context)
     {
         JSONObject ret = super.getPageContextJson(context);
 
-        Container requestContainer = MccManager.get().getMCCRequestContainer();
+        Container requestContainer = MccManager.get().getMCCRequestContainer(context.getContainer());
         ret.put("hasRequestAdminPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccRequestAdminPermission.class));
         ret.put("hasRabPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccRabReviewPermission.class));
         ret.put("hasFinalDecisionPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccFinalReviewPermission.class));
diff --git a/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java
@@ -43,7 +43,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                 }
 
                 String requestId = ctx.get(getBoundKey("requestId"), String.class);
-                Container requestContainer = MccManager.get().getMCCRequestContainer();
+                Container requestContainer = MccManager.get().getMCCRequestContainer(ctx.getContainer());
                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=rabReview", requestContainer);
                 out.write("<a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnURL(ctx.getViewContext().getActionURL()) + "\">Enter Review</a>");
             }
diff --git a/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java
@@ -35,7 +35,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
             public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
             {
                 int requestRowId = ctx.get(getBoundKey("requestId", "rowid"), Integer.class);
-                if (MccManager.get().isRequestAdmin(ctx.getViewContext().getUser()))
+                if (MccManager.get().isRequestAdmin(ctx.getViewContext().getUser(), ctx.getContainer()))
                 {
                     int userId = ctx.get(getBoundKey("requestId", "createdby"), Integer.class);
                     User u = UserManager.getUser(userId);
@@ -60,7 +60,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
                         String requestId = ctx.get(getBoundKey("requestId"), String.class);
 
                         MccManager.RequestStatus st = MccManager.RequestStatus.resolveStatus(status);
-                        Container requestContainer = MccManager.get().getMCCRequestContainer();
+                        Container requestContainer = MccManager.get().getMCCRequestContainer(ctx.getContainer());
                         if (requestContainer == null)
                         {
                             _log.error("RequestScoreActionsDisplayColumnFactory was called, but MCCRequestContainer is not set", new Exception());
diff --git a/mcc/src/org/labkey/mcc/query/TriggerHelper.java b/mcc/src/org/labkey/mcc/query/TriggerHelper.java
@@ -162,7 +162,7 @@ public void ensureReviewRecordsCreated(String objectId, String status, @Nullable
     }
 
     private void sendInitialNotification() {
-        Set<Address> emails = MccManager.get().getRequestNotificationUserEmails();
+        Set<Address> emails = MccManager.get().getRequestNotificationUserEmails(_container);
         if (emails == null || emails.isEmpty())
         {
             _log.error("An MCC request was finalized but there are no notification users");
@@ -175,7 +175,7 @@ private void sendInitialNotification() {
             mail.setFrom("mcc-do-not-reply@ohsu.edu");
             mail.setSubject("MCC Animal Request");
 
-            Container rc = MccManager.get().getMCCRequestContainer();
+            Container rc = MccManager.get().getMCCRequestContainer(_container);
             DetailsURL url = DetailsURL.fromString("/mcc/mccRequestAdmin.view", rc);
             mail.setEncodedHtmlContent("An animal request was submitted on MCC.  <a href=\"" + AppProps.getInstance().getBaseServerUrl() + url.getActionURL().toString()+ "\">Click here to view/approve this request</a>");
             mail.addRecipients(Message.RecipientType.TO, emails.toArray(new Address[0]));
@@ -247,7 +247,7 @@ public void possiblySendRabNotification(int reviewerId)
             mail.setFrom("mcc@ohsu.edu");
             mail.setSubject("MCC RAB Review Assignment");
 
-            Container rc = MccManager.get().getMCCRequestContainer();
+            Container rc = MccManager.get().getMCCRequestContainer(_container);
             DetailsURL url = DetailsURL.fromString("/mcc/rabRequestReview.view", rc);
             mail.setEncodedHtmlContent("One or more MCC requests were assigned to you for RAB Review. <a href=\"" + AppProps.getInstance().getBaseServerUrl() + url.getActionURL().toString()+ "\">Click here to view and enter your review(s)</a>. Please reply to this email if you have any questions.");
             mail.addRecipients(Message.RecipientType.TO, emails.toArray(new Address[0]));

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public class RequestUserAction extends MutatingApiAction<RequestUserForm>`
`108`	`108`	`@Override`
`109`	`109`	`public void validateForm(RequestUserForm form, Errors errors)`
`110`	`110`	`{`
`111`		`- Container mccContainer = MccManager.get().getMCCContainer();`
	`111`	`+ Container mccContainer = MccManager.get().getMCCContainer(getContainer());`
`112`	`112`	`if (mccContainer == null)`
`113`	`113`	`{`
`114`	`114`	`errors.reject(ERROR_MSG, "The MCC project has not been set on this server. This is an administrator error.");`
`@@ -165,17 +165,17 @@ public Object execute(RequestUserForm form, BindException errors) throws Excepti`
`165`	`165`	`row.put("title", form.getTitle());`
`166`	`166`	`row.put("institution", form.getInstitution());`
`167`	`167`	`row.put("reason", form.getReason());`
`168`		`- row.put("container", MccManager.get().getMCCContainer().getId());`
	`168`	`+ row.put("container", MccManager.get().getMCCContainer(getContainer()).getId());`
`169`	`169`
`170`	`170`	`Table.insert(UserManager.getGuestUser(), ti, row);`
`171`	`171`
`172`		`- Set<Address> emails = MccManager.get().getNotificationUserEmails();`
	`172`	`+ Set<Address> emails = MccManager.get().getNotificationUserEmails(getContainer());`
`173`	`173`	`if (emails != null && !emails.isEmpty())`
`174`	`174`	`{`
`175`	`175`	`try`
`176`	`176`	`{`
`177`	`177`	`MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();`
`178`		`- Container c = MccManager.get().getMCCContainer();`
	`178`	`+ Container c = MccManager.get().getMCCContainer(getContainer());`
`179`	`179`	`if (c == null)`
`180`	`180`	`{`
`181`	`181`	`c = getContainer();`
`@@ -299,7 +299,7 @@ public class ApproveUserRequestsAction extends MutatingApiAction<ApproveUserRequ`
`299`	`299`	`@Override`
`300`	`300`	`public void validateForm(ApproveUserRequestsForm form, Errors errors)`
`301`	`301`	`{`
`302`		`- Container mccContainer = MccManager.get().getMCCContainer();`
	`302`	`+ Container mccContainer = MccManager.get().getMCCContainer(getContainer());`
`303`	`303`	`if (mccContainer == null)`
`304`	`304`	`{`
`305`	`305`	`errors.reject(ERROR_MSG, "The MCC project has not been set on this server. This is an administrator error.");`
`@@ -390,7 +390,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws`
`390`	`390`	`allUsers.add(st.getUser());`
`391`	`391`	`}`
`392`	`392`
`393`		`- Container mccContainer = MccManager.get().getMCCContainer();`
	`393`	`+ Container mccContainer = MccManager.get().getMCCContainer(getContainer());`
`394`	`394`	`for (User u : existingUsersGivenAccess)`
`395`	`395`	`{`
`396`	`396`	`boolean isLDAP = AuthenticationManager.isLdapEmail(new ValidEmail(u.getEmail()));`
`@@ -460,7 +460,7 @@ public class RequestHelpAction extends MutatingApiAction<RequestHelpForm>`
`460`	`460`	`@Override`
`461`	`461`	`public void validateForm(RequestHelpForm form, Errors errors)`
`462`	`462`	`{`
`463`		`- Container mccContainer = MccManager.get().getMCCContainer();`
	`463`	`+ Container mccContainer = MccManager.get().getMCCContainer(getContainer());`
`464`	`464`	`if (mccContainer == null)`
`465`	`465`	`{`
`466`	`466`	`errors.reject(ERROR_MSG, "The MCC project has not been set on this server. This is an administrator error.");`
`@@ -487,7 +487,7 @@ public void validateForm(RequestHelpForm form, Errors errors)`
`487`	`487`	`@Override`
`488`	`488`	`public Object execute(RequestHelpForm form, BindException errors) throws Exception`
`489`	`489`	`{`
`490`		`- Set<Address> emails = MccManager.get().getNotificationUserEmails();`
	`490`	`+ Set<Address> emails = MccManager.get().getNotificationUserEmails(getContainer());`
`491`	`491`	`if (emails != null && !emails.isEmpty())`
`492`	`492`	`{`
`493`	`493`	`try`
`@@ -568,7 +568,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`// Ensure groups have target roles:`
`571`		`- Container requestContainer = MccManager.get().getMCCRequestContainer();`
	`571`	`+ Container requestContainer = MccManager.get().getMCCRequestContainer(getContainer());`
`572`	`572`	`if (requestContainer != null)`
`573`	`573`	`{`
`574`	`574`	`Group requestGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME, GroupEnumType.SITE);`
`@@ -604,7 +604,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception`
`604`	`604`	`}`
`605`	`605`	`}`
`606`	`606`
`607`		`- Container dataContainer = MccManager.get().getMCCContainer();`
	`607`	`+ Container dataContainer = MccManager.get().getMCCContainer(getContainer());`
`608`	`608`	`if (dataContainer != null)`
`609`	`609`	`{`
`610`	`610`	`Group adminGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.ADMIN_GROUP_NAME, GroupEnumType.SITE);`
`@@ -622,13 +622,13 @@ public boolean handlePost(Object o, BindException errors) throws Exception`
`622`	`622`	`@Override`
`623`	`623`	`public void validateCommand(Object o, Errors errors)`
`624`	`624`	`{`
`625`		`- Container mccContainer = MccManager.get().getMCCContainer();`
	`625`	`+ Container mccContainer = MccManager.get().getMCCContainer(getContainer());`
`626`	`626`	`if (mccContainer == null)`
`627`	`627`	`{`
`628`	`628`	`errors.reject(ERROR_MSG, "The MCC data container property has not been set");`
`629`	`629`	`}`
`630`	`630`
`631`		`- Container requestContainer = MccManager.get().getMCCRequestContainer();`
	`631`	`+ Container requestContainer = MccManager.get().getMCCRequestContainer(getContainer());`
`632`	`632`	`if (requestContainer == null)`
`633`	`633`	`{`
`634`	`634`	`errors.reject(ERROR_MSG, "The MCC request container property has not been set");`
`@@ -760,7 +760,7 @@ public Object execute(NotifyReviewersForm form, BindException errors) throws Exc`
`760`	`760`	`mail.setFrom("mcc-do-not-reply@ohsu.edu");`
`761`	`761`	`mail.setSubject("MCC Animal Request Reviews");`
`762`	`762`
`763`		`- Container rc = MccManager.get().getMCCRequestContainer();`
	`763`	`+ Container rc = MccManager.get().getMCCRequestContainer(getContainer());`
`764`	`764`	`DetailsURL url = DetailsURL.fromString("/mcc/rabRequestReview.view", rc);`
`765`	`765`	`mail.setEncodedHtmlContent("You have been assigned one or more MCC Animal Requests to review. <a href=\"" + AppProps.getInstance().getBaseServerUrl() + url.getActionURL() + "\">Please click here to view and complete these assignments</a>");`
`766`	`766`	`mail.addRecipients(Message.RecipientType.BCC, emails.toArray(new Address[0]));`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import org.apache.logging.log4j.Logger;`
`4`	`4`	`import org.labkey.api.data.Container;`
	`5`	`+import org.labkey.api.data.ContainerManager;`
`5`	`6`	`import org.labkey.api.data.TableInfo;`
`6`	`7`	`import org.labkey.api.data.TableSelector;`
`7`	`8`	`import org.labkey.api.ldk.LDKService;`
`@@ -37,7 +38,7 @@ public void run(Logger log)`
`37`	`38`
`38`	`39`	`private void checkForDuplicateAliases(Logger log)`
`39`	`40`	`{`
`40`		`- Container studyParent = MccManager.get().getMCCInternalDataContainer();`
	`41`	`+ Container studyParent = MccManager.get().getMCCInternalDataContainer(ContainerManager.getRoot());`
`41`	`42`	`if (studyParent == null)`
`42`	`43`	`{`
`43`	`44`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,11 @@ public static MccManager get()`
`128`	`128`	`return _instance;`
`129`	`129`	`}`
`130`	`130`
`131`		`- public Container getMCCRequestContainer()`
	`131`	`+ public Container getMCCRequestContainer(Container c)`
`132`	`132`	`{`
`133`	`133`	`Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);`
`134`	`134`	`ModuleProperty mp = m.getModuleProperties().get(MccManager.MCCRequestContainer);`
`135`		`- String path = mp.getEffectiveValue(ContainerManager.getRoot());`
	`135`	`+ String path = mp.getEffectiveValue(c);`
`136`	`136`	`if (path == null)`
`137`	`137`	`return null;`
`138`	`138`
`@@ -144,31 +144,31 @@ public String getMccAdminEmail()`
`144`	`144`	`return "mcc@ohsu.edu";`
`145`	`145`	`}`
`146`	`146`
`147`		`- public Container getMCCInternalDataContainer()`
	`147`	`+ public Container getMCCInternalDataContainer(Container c)`
`148`	`148`	`{`
`149`	`149`	`Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);`
`150`	`150`	`ModuleProperty mp = m.getModuleProperties().get(MccManager.MCCInternalDataContainerPropName);`
`151`		`- String path = mp.getEffectiveValue(ContainerManager.getRoot());`
	`151`	`+ String path = mp.getEffectiveValue(c);`
`152`	`152`	`if (path == null)`
`153`	`153`	`return null;`
`154`	`154`
`155`	`155`	`return ContainerManager.getForPath(path);`
`156`	`156`	`}`
`157`	`157`
`158`		`- public Container getMCCContainer()`
	`158`	`+ public Container getMCCContainer(Container c)`
`159`	`159`	`{`
`160`	`160`	`Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);`
`161`	`161`	`ModuleProperty mp = m.getModuleProperties().get(MccManager.ContainerPropName);`
`162`		`- String path = mp.getEffectiveValue(ContainerManager.getRoot());`
	`162`	`+ String path = mp.getEffectiveValue(c);`
`163`	`163`	`if (path == null)`
`164`	`164`	`return null;`
`165`	`165`
`166`	`166`	`return ContainerManager.getForPath(path);`
`167`	`167`	`}`
`168`	`168`
`169`		`- public boolean isRequestAdmin(User u)`
	`169`	`+ public boolean isRequestAdmin(User u, Container container)`
`170`	`170`	`{`
`171`		`- Container c = getMCCRequestContainer();`
	`171`	`+ Container c = getMCCRequestContainer(container);`
`172`	`172`	`if (c == null)`
`173`	`173`	`{`
`174`	`174`	`_log.error("MccManager.isRequestAdmin called, but MCCRequestContainer has not been set");`
`@@ -191,21 +191,21 @@ public File getZimsImportFolder(Container c)`
`191`	`191`	`return new File(val);`
`192`	`192`	`}`
`193`	`193`
`194`		`- public Set<Address> getNotificationUserEmails()`
	`194`	`+ public Set<Address> getNotificationUserEmails(Container c)`
`195`	`195`	`{`
`196`		`- return getUserEmailsForProp(MccManager.NotifyPropName);`
	`196`	`+ return getUserEmailsForProp(MccManager.NotifyPropName, c);`
`197`	`197`	`}`
`198`	`198`
`199`		`- public Set<Address> getRequestNotificationUserEmails()`
	`199`	`+ public Set<Address> getRequestNotificationUserEmails(Container c)`
`200`	`200`	`{`
`201`		`- return getUserEmailsForProp(MccManager.MCCRequestNotificationUsers);`
	`201`	`+ return getUserEmailsForProp(MccManager.MCCRequestNotificationUsers, c);`
`202`	`202`	`}`
`203`	`203`
`204`		`- private Set<Address> getUserEmailsForProp(String propName)`
	`204`	`+ private Set<Address> getUserEmailsForProp(String propName, Container c)`
`205`	`205`	`{`
`206`	`206`	`Module m = ModuleLoader.getInstance().getModule(MccModule.NAME);`
`207`	`207`	`ModuleProperty mp = m.getModuleProperties().get(propName);`
`208`		`- String userNames = mp.getEffectiveValue(ContainerManager.getRoot());`
	`208`	`+ String userNames = mp.getEffectiveValue(c);`
`209`	`209`	`userNames = StringUtils.trimToNull(userNames);`
`210`	`210`	`if (userNames == null)`
`211`	`211`	`return null;`
`@@ -227,7 +227,7 @@ private Set<Address> getUserEmailsForProp(String propName)`
`227`	`227`	`}`
`228`	`228`	`else`
`229`	`229`	`{`
`230`		`- UserPrincipal up = SecurityManager.getPrincipal(principalName, getMCCContainer(), true);`
	`230`	`+ UserPrincipal up = SecurityManager.getPrincipal(principalName, getMCCContainer(c), true);`
`231`	`231`	`if (up == null)`
`232`	`232`	`{`
`233`	`233`	`_log.error("Unknown user/group registered for MCC notifications: [" + principalName + "]", new Exception());`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public JSONObject getPageContextJson(ContainerUser context)`
`92`	`92`	`{`
`93`	`93`	`JSONObject ret = super.getPageContextJson(context);`
`94`	`94`
`95`		`- Container requestContainer = MccManager.get().getMCCRequestContainer();`
	`95`	`+ Container requestContainer = MccManager.get().getMCCRequestContainer(context.getContainer());`
`96`	`96`	`ret.put("hasRequestAdminPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccRequestAdminPermission.class));`
`97`	`97`	`ret.put("hasRabPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccRabReviewPermission.class));`
`98`	`98`	`ret.put("hasFinalDecisionPermission", requestContainer != null && requestContainer.hasPermission(context.getUser(), MccFinalReviewPermission.class));`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`String requestId = ctx.get(getBoundKey("requestId"), String.class);`
`46`		`- Container requestContainer = MccManager.get().getMCCRequestContainer();`
	`46`	`+ Container requestContainer = MccManager.get().getMCCRequestContainer(ctx.getContainer());`
`47`	`47`	`DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=rabReview", requestContainer);`
`48`	`48`	`out.write("<a class=\"labkey-text-link\" href=\"" + url.getActionURL().addReturnURL(ctx.getViewContext().getActionURL()) + "\">Enter Review</a>");`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)`
`35`	`35`	`public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException`
`36`	`36`	`{`
`37`	`37`	`int requestRowId = ctx.get(getBoundKey("requestId", "rowid"), Integer.class);`
`38`		`- if (MccManager.get().isRequestAdmin(ctx.getViewContext().getUser()))`
	`38`	`+ if (MccManager.get().isRequestAdmin(ctx.getViewContext().getUser(), ctx.getContainer()))`
`39`	`39`	`{`
`40`	`40`	`int userId = ctx.get(getBoundKey("requestId", "createdby"), Integer.class);`
`41`	`41`	`User u = UserManager.getUser(userId);`
`@@ -60,7 +60,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep`
`60`	`60`	`String requestId = ctx.get(getBoundKey("requestId"), String.class);`
`61`	`61`
`62`	`62`	`MccManager.RequestStatus st = MccManager.RequestStatus.resolveStatus(status);`
`63`		`- Container requestContainer = MccManager.get().getMCCRequestContainer();`
	`63`	`+ Container requestContainer = MccManager.get().getMCCRequestContainer(ctx.getContainer());`
`64`	`64`	`if (requestContainer == null)`
`65`	`65`	`{`
`66`	`66`	`_log.error("RequestScoreActionsDisplayColumnFactory was called, but MCCRequestContainer is not set", new Exception());`