Add and populate core.Documents.ParentType column (#587)

Author: labkey-adam

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java

@@ -106,8 +106,8 @@ protected void init()
     {
         addController(PanoramaPublicController.NAME, PanoramaPublicController.class);
         PanoramaPublicSchema.register(this);
-        AttachmentService.get().registerAttachmentType(CatalogImageAttachmentType.get());
-        AttachmentService.get().registerAttachmentType(PanoramaPublicLogoResourceType.get());
+        AttachmentService.get().registerAttachmentParentType(CatalogImageAttachmentType.get());
+        AttachmentService.get().registerAttachmentParentType(PanoramaPublicLogoResourceType.get());
     }
 
     @Override

panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoAttachmentParent.java

@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.labkey.api.attachments.AttachmentType;
+import org.labkey.api.attachments.AttachmentParentType;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.panoramapublic.model.Journal;
@@ -29,7 +29,7 @@ public static PanoramaPublicLogoAttachmentParent get()
     }
 
     @Override
-    public @NotNull AttachmentType getAttachmentType()
+    public @NotNull AttachmentParentType getAttachmentParentType()
     {
         return PanoramaPublicLogoResourceType.get();
     }

panoramapublic/src/org/labkey/panoramapublic/bluesky/PanoramaPublicLogoResourceType.java

@@ -1,11 +1,11 @@
 package org.labkey.panoramapublic.bluesky;
 
 import org.jetbrains.annotations.NotNull;
-import org.labkey.api.attachments.AttachmentType;
+import org.labkey.api.attachments.AttachmentParentType;
 import org.labkey.api.data.CoreSchema;
 import org.labkey.api.data.SQLFragment;
 
-public class PanoramaPublicLogoResourceType implements AttachmentType
+public class PanoramaPublicLogoResourceType implements AttachmentParentType
 {
     private static final PanoramaPublicLogoResourceType INSTANCE = new PanoramaPublicLogoResourceType();
 
@@ -21,17 +21,17 @@ private PanoramaPublicLogoResourceType()
     @Override
     public @NotNull String getUniqueName()
     {
-        return getClass().getName();
+        return "PanoramaPublicLogoResource";
     }
 
     @Override
     public void addWhereSql(SQLFragment sql, String parentColumn, String documentNameColumn)
     {
         sql.append(parentColumn).append(" IN (SELECT EntityId FROM ")
-                .append(CoreSchema.getInstance().getTableInfoContainers(), "c").append(")")
-                .append(" AND (")
-                .append(documentNameColumn).append(" LIKE ")
-                .appendStringLiteral(PanoramaPublicLogoManager.LOGO_FILE_PREFIX + "%", CoreSchema.getInstance().getSqlDialect())
-                .append(") ");
+            .append(CoreSchema.getInstance().getTableInfoContainers(), "c").append(")")
+            .append(" AND (")
+            .append(documentNameColumn).append(" LIKE ")
+            .appendStringLiteral(PanoramaPublicLogoManager.LOGO_FILE_PREFIX + "%", CoreSchema.getInstance().getSqlDialect())
+            .append(") ");
     }
 }

panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentParent.java

@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.attachments.AttachmentParent;
-import org.labkey.api.attachments.AttachmentType;
+import org.labkey.api.attachments.AttachmentParentType;
 import org.labkey.api.data.Container;
 import org.labkey.api.view.ShortURLRecord;
 
@@ -29,7 +29,7 @@ public String getContainerId()
     }
 
     @Override
-    public @NotNull AttachmentType getAttachmentType()
+    public @NotNull AttachmentParentType getAttachmentParentType()
     {
         return CatalogImageAttachmentType.get();
     }

panoramapublic/src/org/labkey/panoramapublic/catalog/CatalogImageAttachmentType.java

@@ -1,11 +1,11 @@
 package org.labkey.panoramapublic.catalog;
 
 import org.jetbrains.annotations.NotNull;
-import org.labkey.api.attachments.AttachmentType;
+import org.labkey.api.attachments.AttachmentParentType;
 import org.labkey.api.data.CoreSchema;
 import org.labkey.api.data.SQLFragment;
 
-public class CatalogImageAttachmentType implements AttachmentType
+public class CatalogImageAttachmentType implements AttachmentParentType
 {
     private static final CatalogImageAttachmentType INSTANCE = new CatalogImageAttachmentType();
 
@@ -21,7 +21,7 @@ private CatalogImageAttachmentType()
     @Override
     public @NotNull String getUniqueName()
     {
-        return getClass().getName();
+        return "CatalogImage";
     }
 
     @Override