Skip to content

Commit 204cc9a

Browse files
committed
More code cleanup
1 parent 586a9cc commit 204cc9a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

SequenceAnalysis/api-src/org/labkey/api/sequenceanalysis/RefNtSequenceModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public RefNtSequenceModel()
9292

9393
public static RefNtSequenceModel getForRowId(int rowId)
9494
{
95-
return new TableSelector(DbSchema.get("sequenceanalysis").getTable("ref_nt_sequences")).getObject(rowId, RefNtSequenceModel.class);
95+
return new TableSelector(DbSchema.get("sequenceanalysis", null).getTable("ref_nt_sequences")).getObject(rowId, RefNtSequenceModel.class);
9696
}
9797

9898
public int getRowid()
@@ -429,7 +429,7 @@ public void createFileForSequence(User u, String sequence, @Nullable File outDir
429429
setSeqLength(sequence.length());
430430
setSequenceFile(d.getRowId());
431431

432-
TableInfo ti = DbSchema.get("sequenceanalysis").getTable("ref_nt_sequences");
432+
TableInfo ti = DbSchema.get("sequenceanalysis", null).getTable("ref_nt_sequences");
433433

434434
Table.update(u, ti, this, _rowid);
435435
}

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,10 @@ protected static void doInitialSetUp(String projectName) throws Exception
233233
if (project == null)
234234
{
235235
project = ContainerManager.createContainer(ContainerManager.getRoot(), projectName);
236+
237+
//disable search so we dont get conflicts when deleting folder quickly
238+
ContainerManager.updateSearchable(project, false, TestContext.get().getUser());
239+
236240
Set<Module> modules = new HashSet<>();
237241
modules.addAll(project.getActiveModules());
238242
modules.add(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.NAME));

0 commit comments

Comments
 (0)