Add new MccRequestAdminPermission permission and incorporate into MCC

Author: bbimber

mcc/resources/views/nihReview.html

@@ -7,7 +7,7 @@
             return;
 
         Ext4.get(webpart.wrapperDivId).update(
-            'Below are all MCC requests awaiting the final decision. By default this shows only pending requests; however, you can the left-hand \'Views\' button to toggle between this and all requests.' +
+            'Below are all MCC requests awaiting the final decision. By default this shows only pending requests; however, you can click the left-hand \'Views\' button to toggle between this and all requests.' +
             '<p></p>' +
             '<a class="labkey-text-link" href="/become-a-user.html#request-animals">Click Here to View Documentation on the Request Process and Scoring Criteria</a>' +
             '<br>' +

mcc/src/org/labkey/mcc/MccUserSchema.java

@@ -22,8 +22,8 @@
 import org.labkey.mcc.security.MccRabReviewPermission;
 import org.labkey.mcc.security.MccRequestAdminPermission;
 import org.labkey.mcc.security.MccRequestorPermission;
+import org.labkey.mcc.security.MccViewRequestsPermission;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 public class MccUserSchema extends SimpleUserSchema
@@ -65,9 +65,9 @@ else if (MccSchema.TABLE_REQUEST_REVIEWS.equalsIgnoreCase(name))
         else if (MccSchema.TABLE_REQUEST_SCORE.equalsIgnoreCase(name))
         {
             CustomPermissionsTable<?> ret = new CustomPermissionsTable<>(this, schemaTable, cf);
-            ret.addPermissionMapping(ReadPermission.class, MccRequestAdminPermission.class);
-            ret.addPermissionMapping(InsertPermission.class, MccRequestAdminPermission.class);
-            ret.addPermissionMapping(UpdatePermission.class, MccRequestAdminPermission.class);
+            ret.addPermissionMapping(ReadPermission.class, MccViewRequestsPermission.class);
+            ret.addPermissionMapping(InsertPermission.class, MccViewRequestsPermission.class);
+            ret.addPermissionMapping(UpdatePermission.class, MccViewRequestsPermission.class);
             ret.addPermissionMapping(DeletePermission.class, MccRequestAdminPermission.class);
 
             ret = ret.init();

mcc/src/org/labkey/mcc/security/MccDataAdminRole.java

@@ -10,7 +10,7 @@ public class MccDataAdminRole extends AbstractRole
 {
     public MccDataAdminRole()
     {
-        super("MccDataAdmin", "These users can administer data and animal requests", ReadPermission.class, InsertPermission.class, UpdatePermission.class, MccRequestorPermission.class, MccDataAdminPermission.class, MccRequestAdminPermission.class, MccRabReviewPermission.class);
+        super("MccDataAdmin", "These users can administer data and animal requests", ReadPermission.class, InsertPermission.class, UpdatePermission.class, MccRequestorPermission.class, MccDataAdminPermission.class, MccRequestAdminPermission.class, MccViewRequestsPermission.class, MccRabReviewPermission.class);
     }
 
     @Override

mcc/src/org/labkey/mcc/security/MccFinalReviewerRole.java

@@ -10,7 +10,7 @@ public class MccFinalReviewerRole extends AbstractRole
 {
     public MccFinalReviewerRole()
     {
-        super("MccFinalReviewer", "These users can enter the final reviews for MCC requests", ReadPermission.class, InsertPermission.class, UpdatePermission.class, MccRequestorPermission.class, MccRabReviewPermission.class, MccFinalReviewPermission.class);
+        super("MccFinalReviewer", "These users can enter the final reviews for MCC requests", ReadPermission.class, InsertPermission.class, UpdatePermission.class, MccRequestorPermission.class, MccRabReviewPermission.class, MccViewRequestsPermission.class, MccFinalReviewPermission.class);
     }
 
     @Override

mcc/src/org/labkey/mcc/security/MccRabReviewerRole.java

@@ -10,7 +10,7 @@ public class MccRabReviewerRole extends AbstractRole
 {
     public MccRabReviewerRole()
     {
-        super("MccRabReviewer", "These users can enter RAB reviews", ReadPermission.class, InsertPermission.class, UpdatePermission.class, MccRequestorPermission.class, MccRabReviewPermission.class);
+        super("MccRabReviewer", "These users can enter RAB reviews", ReadPermission.class, InsertPermission.class, UpdatePermission.class, MccRequestorPermission.class, MccViewRequestsPermission.class, MccRabReviewPermission.class);
     }
 
     @Override

mcc/src/org/labkey/mcc/security/MccViewRequestsPermission.java

@@ -0,0 +1,14 @@
+package org.labkey.mcc.security;
+
+import org.labkey.api.security.permissions.AbstractPermission;
+
+/**
+ * This is required to view the data from request_scores and other approval steps.
+ */
+public class MccViewRequestsPermission extends AbstractPermission
+{
+    public MccViewRequestsPermission()
+    {
+        super("MccFinalReview", "This permission is required to enter the final decision on animal requests in the MCC");
+    }
+}