Skip to content
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

[bot] Fast-forward for 24.11.4 #884

Merged
merged 2 commits into from
Jan 9, 2025
Merged

[bot] Fast-forward for 24.11.4 #884

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
31b162c
Bump schema versions to 25.000 (#879)
labkey-adam Dec 31, 2024
941c9d0
Test updates (#878)
labkey-sweta Jan 2, 2025
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
10 changes: 2 additions & 8 deletions EHR_App/src/org/labkey/ehr_app/EHR_AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 24.000;
}

@Override
public boolean hasScripts()
{
return true;
return 25.000;
}

@Override
Expand All @@ -81,7 +75,7 @@ protected void registerSchemas()
DefaultSchema.registerProvider(EHR_AppSchema.NAME, new DefaultSchema.SchemaProvider(this)
{
@Override
public @Nullable QuerySchema createSchema(DefaultSchema schema, Module module)
public @NotNull QuerySchema createSchema(DefaultSchema schema, Module module)
{
return new EHR_AppUserSchema(EHR_AppSchema.NAME, null, schema.getUser(), schema.getContainer(), EHR_AppSchema.getInstance().getSchema());
}
Expand Down
10 changes: 1 addition & 9 deletions EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.ehr_purchasing.EHR_PurchasingDomainKind;
import org.labkey.api.exp.property.PropertyService;
Expand Down Expand Up @@ -46,7 +45,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 24.000;
return 25.000;
}

@Override
Expand Down Expand Up @@ -85,13 +84,6 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
});
}

@Override
@NotNull
public Collection<String> getSummary(Container c)
{
return Collections.emptyList();
}

@Override
@NotNull
public Set<String> getSchemaNames()
Expand Down
8 changes: 1 addition & 7 deletions ehr/src/org/labkey/ehr/EHRModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 24.005;
}

@Override
public boolean hasScripts()
{
return true;
return 25.000;
}

@Override
Expand Down
1 change: 1 addition & 0 deletions ehr/test/src/org/labkey/test/pages/ehr/EHRLookupPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class EHRLookupPage extends LabKeyPage<EHRLookupPage.ElementCache>
public EHRLookupPage(WebDriverWrapper driver)
{
super(driver);
waitForPage();
}
public void waitForPage()
{
Expand Down
9 changes: 1 addition & 8 deletions ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 24.001;
return 25.000;
}

@Override
Expand Down Expand Up @@ -120,13 +120,6 @@ public void userDeletedFromSite(User user)
});
}

@Override
@NotNull
public Collection<String> getSummary(Container c)
{
return Collections.emptyList();
}

@Override
@NotNull
public Set<String> getSchemaNames()
Expand Down
Loading