Give users access to project

Author: labkey-jeckels

resources/schemas/targetedms.xml

@@ -1794,7 +1794,9 @@
         <columns>
             <column columnName="Id"/>
             <column columnName="project"/>
-            <column columnName="researcher"/>
+            <column columnName="researcher">
+                <required>true</required>
+            </column>
             <column columnName="Created"/>
             <column columnName="CreatedBy"/>
             <column columnName="Modified"/>

resources/views/scheduleInstrument.html

@@ -367,7 +367,8 @@ <h3>Time Scheduled</h3>
             sort: 'name',
             columns: 'Id,researcher/displayName,researcher/UserId,project',
             filterArray: [
-                LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL)
+                LABKEY.Filter.create('project', project, LABKEY.Filter.Types.EQUAL),
+                LABKEY.Filter.create('researcher/UserId', project, LABKEY.Filter.Types.NONBLANK)
             ],
             scope: this,
             success: function (result) {

test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java

@@ -23,6 +23,8 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.TestTimeoutException;
 import org.labkey.test.util.APIContainerHelper;
+import org.labkey.test.util.ApiPermissionsHelper;
+import org.labkey.test.util.PermissionsHelper;
 import org.labkey.test.util.PortalHelper;
 
 import java.io.IOException;
@@ -51,6 +53,9 @@ private void doInit() throws IOException, CommandException
 
         int schedulerUser1Id = _userHelper.createUser(SCHEDULER_USER_1).getUserId();
         int schedulerUser2Id = _userHelper.createUser(SCHEDULER_USER_2).getUserId();
+        ApiPermissionsHelper apiPermissionsHelper = new ApiPermissionsHelper(this);
+        apiPermissionsHelper.addMemberToRole(SCHEDULER_USER_1, "Editor", PermissionsHelper.MemberType.user);
+        apiPermissionsHelper.addMemberToRole(SCHEDULER_USER_2, "Editor", PermissionsHelper.MemberType.user);
 
         InsertRowsCommand instrumentInsert = new InsertRowsCommand("targetedms", "msInstrument");
         instrumentInsert.setRows(Arrays.asList(