Skip to content

Commit 4fc511b

Browse files
committed
Allow editing of saved templates
1 parent c2fe75f commit 4fc511b

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

SequenceAnalysis/resources/schemas/sequenceanalysis.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,7 +2378,7 @@
23782378
<column columnName="name"/>
23792379
<column columnName="description"/>
23802380
<column columnName="taskid">
2381-
<isHidden>true</isHidden>
2381+
<!--<isHidden>true</isHidden>-->
23822382
</column>
23832383
<column columnName="originalAnalysisId">
23842384
<columnTitle>Original Analysis</columnTitle>
@@ -2387,10 +2387,11 @@
23872387
<fkTable>sequence_analyses</fkTable>
23882388
<fkColumnName>rowid</fkColumnName>
23892389
</fk>
2390+
<isHidden>true</isHidden>
23902391
</column>
23912392
<column columnName="json">
23922393
<columnTitle>Config</columnTitle>
2393-
<isHidden>true</isHidden>
2394+
<!--<isHidden>true</isHidden>-->
23942395
</column>
23952396
<column columnName="container">
23962397
<isHidden>true</isHidden>

SequenceAnalysis/resources/web/SequenceAnalysis/panel/BaseSequencePanel.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@ Ext4.define('SequenceAnalysis.panel.BaseSequencePanel', {
334334
xtype: 'ldk-linkbutton',
335335
text: 'Manage Saved Templates',
336336
linkCls: 'labkey-text-link',
337-
linkTarget: LABKEY.ActionURL.buildURL('query', 'executeQuery', Laboratory.Utils.getQueryContainerPath(), {schemaName: 'sequenceanalysis', 'query.queryName': 'saved_analyses', 'query.jobType~eq': this.jobType}),
337+
href: LABKEY.ActionURL.buildURL('query', 'executeQuery', Laboratory.Utils.getQueryContainerPath(), {schemaName: 'sequenceanalysis', 'query.queryName': 'saved_analyses', 'query.taskid~eq': this.jobType}),
338+
linkTarget: '_blank',
338339
visible: LABKEY.Security.currentUser.isAdmin,
339340
scope: this
340341
}]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public BasePipelineStepAction(String htmlFile)
384384
public ModelAndView getView(Object form, BindException errors)
385385
{
386386
LinkedHashSet<ClientDependency> cds = new LinkedHashSet<>();
387-
for (PipelineStepProvider fact : SequencePipelineService.get().getAllProviders())
387+
for (PipelineStepProvider<?> fact : SequencePipelineService.get().getAllProviders())
388388
{
389389
cds.addAll(fact.getClientDependencies());
390390
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,9 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext)
390390
LDKService.get().registerQueryButton(new ShowEditUIButton(this, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_LIBRARIES, UpdatePermission.class), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_LIBRARIES);
391391
LDKService.get().registerQueryButton(new ShowEditUIButton(this, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_NT_SEQUENCES, UpdatePermission.class), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_NT_SEQUENCES);
392392
LDKService.get().registerQueryButton(new ShowEditUIButton(this, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READ_DATA, UpdatePermission.class), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READ_DATA);
393+
LDKService.get().registerQueryButton(new ShowEditUIButton(this, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_SAVED_ANALYSES, UpdatePermission.class), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_SAVED_ANALYSES);
393394
LDKService.get().registerQueryButton(new ShowBulkEditButton(this, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_NT_SEQUENCES), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_REF_NT_SEQUENCES);
395+
394396
LDKService.get().registerQueryButton(new ShowBulkEditButton(this, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READ_DATA), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READ_DATA);
395397

396398
LDKService.get().registerQueryButton(new AddSraRunButton(), SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READSETS);

0 commit comments

Comments
 (0)