Skip to content

Commit 2381890

Browse files
authored
Rename EVERYTHING -> EVERYTHING_UNSAFE (#515)
1 parent a21c882 commit 2381890

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ protected void applyContainerFilter(ContainerFilter filter)
340340
sql.append(super.getFromSQL("X"));
341341
sql.append(" ");
342342

343-
if (getContainerFilter() != ContainerFilter.EVERYTHING)
343+
if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
344344
{
345345
SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");
346346
joinToExpAnnotSql.append(PanoramaPublicManager.getTableInfoSubmission(), "s");

panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ private ExprColumn getAnnouncementIdCol()
427427

428428
// Add a FK lookup so that we can access the "Modified" etc. columns on the "Announcement" table.
429429
announcementCol.setFk(QueryForeignKey.from(getUserSchema(),
430-
ContainerFilter.EVERYTHING) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
430+
ContainerFilter.EVERYTHING_UNSAFE) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
431431
.schema("announcement") // Cannot use CommSchemma.getSchemaName() which returns "comm". This only works if we use "announcement".
432432
// AnnouncementSchema is not part of the LabKey API.
433433
.to("Announcement", // Table name cannot be the plural, "Announcements", returned by CommSchema.getInstance().getTableInfoAnnouncements().getName()

panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public SQLFragment getFromSQL(String alias)
7676
sql.append(super.getFromSQL("X"));
7777
sql.append(" ");
7878

79-
if (getContainerFilter() != ContainerFilter.EVERYTHING)
79+
if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
8080
{
8181
// Filter on the Container column of the associated ExperimentAnnotations row
8282
SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");

panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public SQLFragment getFromSQL(String alias)
5757
sql.append(super.getFromSQL(TABLE_ALIAS));
5858
sql.append(" ");
5959

60-
if (getContainerFilter() != ContainerFilter.EVERYTHING)
60+
if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
6161
{
6262
sql.append(_joinSql.getSQL());
6363
sql.append(" WHERE ");

panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public SQLFragment getFromSQL(String alias)
113113
sql.append(super.getFromSQL("X"));
114114
sql.append(" ");
115115

116-
if (getContainerFilter() != ContainerFilter.EVERYTHING)
116+
if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
117117
{
118118
SQLFragment joinSql = new SQLFragment("INNER JOIN ");
119119
joinSql.append(PanoramaPublicManager.getTableInfoJournalExperiment(), "je")

0 commit comments

Comments
 (0)