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

Jump to bottom

[bot] Merge 23.7 to develop #376

Merged
merged 2 commits into from
Aug 29, 2023
Merged

[bot] Merge 23.7 to develop #376

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
a9c6d80
Increase length of keywords column of panoramapublic.experimentannota…
vagisha Aug 23, 2023
f4b8480
Merge 23.7 to develop
labkey-teamcity Aug 29, 2023
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
1 change: 1 addition & 0 deletions panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-23.000-23.001.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE panoramapublic.experimentannotations ALTER COLUMN keywords TYPE TEXT;
4 changes: 3 additions & 1 deletion panoramapublic/resources/schemas/panoramapublic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@
<column columnName="SourceExperimentId"/>
<column columnName="SourceExperimentPath"/>
<column columnName="ShortUrl"/>
<column columnName="Keywords"/>
<column columnName="Keywords">
<inputRows>2</inputRows>
</column>
<column columnName="LabHead">
<fk>
<fkColumnName>UserId</fkColumnName>
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 22.006;
return 23.001;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ic/test/src/org/labkey/test/components/panoramapublic/TargetedMsExperimentInsertPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private class Elements extends InsertPage.Elements
{
public Locator.XPathLocator expTitle = body.append(Locator.tagWithName("textarea", "title"));
public Locator.XPathLocator expAbstract = body.append(Locator.tagWithName("textarea", "abstract"));
public Locator.XPathLocator keywords = body.append(Locator.input("keywords"));
public Locator.XPathLocator keywords = body.append(Locator.tagWithName("textarea","keywords"));
public Locator.XPathLocator submitterAffiliation = body.append(Locator.input("submitterAffiliation"));
public Locator.XPathLocator organismInputDiv = body.append(Locator.id("input-picker-div-organism")
.descendant(Locator.tagWithClass("span", "twitter-typeahead"))
Expand Down