Skip to content

Use SchemaKey in ExperimentRunType constructor#172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 2 commits into from
May 1, 2020
Merged

Use SchemaKey in ExperimentRunType constructor #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
616b3fc
Use SchemaKey in ExperimentRunType constructor
labkey-kevink Apr 29, 2020
aae3c65
Merge branch 'develop' into fb_rungraph_deets
labkey-nicka May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/labkey/targetedms/TargetedMSExperimentRunType.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ public class TargetedMSExperimentRunType extends ExperimentRunType

public TargetedMSExperimentRunType()
{
super("Imported Targeted MS Results", TargetedMSSchema.SCHEMA_NAME, TargetedMSSchema.TABLE_TARGETED_MS_RUNS);
super("Imported Targeted MS Results", TargetedMSSchema.SCHEMA_KEY, TargetedMSSchema.TABLE_TARGETED_MS_RUNS);
_protocolPrefixes = new String[] {TargetedMSModule.IMPORT_SKYDOC_PROTOCOL_OBJECT_PREFIX,
TargetedMSModule.IMPORT_SKYZIP_PROTOCOL_OBJECT_PREFIX};
}
Expand Down
4 changes: 3 additions & 1 deletion src/org/labkey/targetedms/TargetedMSSchema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import org.labkey.api.query.QuerySchema;
import org.labkey.api.query.QuerySettings;
import org.labkey.api.query.QueryView;
import org.labkey.api.query.SchemaKey;
import org.labkey.api.query.UserIdQueryForeignKey;
import org.labkey.api.query.UserSchema;
import org.labkey.api.security.User;
Expand DownExpand Up@@ -91,6 +92,7 @@
public class TargetedMSSchema extends UserSchema
{
public static final String SCHEMA_NAME = "targetedms";
public static final SchemaKey SCHEMA_KEY = SchemaKey.fromParts("targetedms");
public static final String SCHEMA_DESCR = "Contains targeted mass spec data imported from Skyline documents";

// Tables
Expand DownExpand Up@@ -221,7 +223,7 @@ public QuerySchema createSchema(DefaultSchema schema, Module module)

public TargetedMSSchema(User user, Container container)
{
super(SCHEMA_NAME, SCHEMA_DESCR, user, container, TargetedMSManager.getSchema());
super(SCHEMA_KEY, SCHEMA_DESCR, user, container, TargetedMSManager.getSchema(), null);
_expSchema = new ExpSchema(user, container);
}

Expand Down