Bugfix to StudiesTriggerFactory

Author: bbimber

Studies/src/org/labkey/studies/query/StudiesTriggerFactory.java

@@ -76,7 +76,7 @@ private void possiblyResolveStudy(@Nullable Map<String, Object> row, Container c
                 if (!NumberUtils.isCreatable(row.get(sourceProperty).toString()))
                 {
                     Container target = c.isWorkbookOrTab() ? c.getParent() : c;
-                    SimpleFilter filter = new SimpleFilter(FieldKey.fromString("container"), target.getEntityId()).addCondition(FieldKey.fromString("name"), row.get(sourceProperty));
+                    SimpleFilter filter = new SimpleFilter(FieldKey.fromString("container"), target.getEntityId()).addCondition(FieldKey.fromString("studyName"), row.get(sourceProperty));
                     List<Integer> rowIds = new TableSelector(StudiesSchema.getInstance().getSchema().getTable(StudiesSchema.TABLE_STUDIES), PageFlowUtil.set("rowId"), filter, null).getArrayList(Integer.class);
                     if (rowIds.size() == 1)
                     {

Studies/src/org/labkey/studies/query/StudiesUserSchema.java

@@ -124,23 +124,23 @@ else if (TABLE_LOOKUPS.equalsIgnoreCase(name))
         }
         else if (TABLE_STUDIES.equalsIgnoreCase(name))
         {
-            return createStudyDesignTable(name, cf);
+            return createStudyDesignTable(name, cf, false);
         }
         else if (TABLE_COHORTS.equalsIgnoreCase(name))
         {
-            return createStudyDesignTable(name, cf);
+            return createStudyDesignTable(name, cf, true);
         }
         else if (TABLE_ANCHOR_EVENTS.equalsIgnoreCase(name))
         {
-            return createStudyDesignTable(name, cf);
+            return createStudyDesignTable(name, cf, true);
         }
         else if (TABLE_EXPECTED_TIMEPOINTS.equalsIgnoreCase(name))
         {
-            return createStudyDesignTable(name, cf);
+            return createStudyDesignTable(name, cf, true);
         }
         else if (TABLE_TIMEPOINT_TO_DATE.equalsIgnoreCase(name))
         {
-            return createStudyDesignTable(name, cf);
+            return createStudyDesignTable(name, cf, true);
         }
         else if (TABLE_EVENT_TYPES.equalsIgnoreCase(name))
         {
@@ -155,14 +155,18 @@ else if (TABLE_EVENT_TYPES.equalsIgnoreCase(name))
         return super.createTable(name, cf);
     }
 
-    private TableInfo createStudyDesignTable(String name, ContainerFilter cf)
+    private TableInfo createStudyDesignTable(String name, ContainerFilter cf, boolean addTriggers)
     {
         CustomPermissionsTable<SimpleUserSchema> ret = new CustomPermissionsTable<>(this, createSourceTable(name), cf);
         ret.addPermissionMapping(InsertPermission.class, StudiesDataAdminPermission.class);
         ret.addPermissionMapping(UpdatePermission.class, StudiesDataAdminPermission.class);
         ret.addPermissionMapping(DeletePermission.class, StudiesDataAdminPermission.class);
         ret.addPermissionMapping(ReadPermission.class, StudiesDataAdminPermission.class);
-        ret.addTriggerFactory(new StudiesTriggerFactory());
+
+        if (addTriggers)
+        {
+            ret.addTriggerFactory(new StudiesTriggerFactory());
+        }
 
         return ret.init();
     }