Skip to content

[bot] Fast-forward for 26.3.16#961

Merged
github-actions[bot] merged 3 commits into
release26.3from
26.3_ff_bot_26.3.16
Jul 7, 2026
Merged

[bot] Fast-forward for 26.3.16#961
github-actions[bot] merged 3 commits into
release26.3from
26.3_ff_bot_26.3.16

Conversation

@github-actions

@github-actions github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown

Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.3_ff_bot_26.3.16

jallentxbiomed and others added 3 commits June 30, 2026 09:32
…nterface (#954)

Fixes two bugs on the Animal Groups data-entry form
(animalGroupCategories):

1. "Update failed: Unable to convert value 'null' to Integer" when
saving a row with a blank Sort Order
- AnimalGroupsController.UpdateGroupsAction was passing the JSON null
sentinel straight to the row map. Guarded sort_order with
o.isNull("sortOrder") so a blank field is sent as a real SQL null (the
column is nullable).

2. Start/End date drifting back one day on every edit (timezone
round-trip)
This needed a coordinated server + client change; neither half fixes it
alone:
- Server (AnimalGroup.toJSON): format date and endDate with
DateUtil.formatIsoDate(...) so the payload carries a bare Y-m-d string
instead of a zoned datetime.
- Client (AnimalGroupsStore.js): added dateReadFormat: 'Y-m-d' to the
date and endDate fields so ExtJS parses that string as a local date
rather than UTC midnight (which shifted it to the prior day in Central
time).
#### Rationale
Package updates for client-side application.

#### Changes
- Update all packages to latest
- Mark as `private` as this is not a published npm package

#### Tasks
- [x] Manual testing @labkey-martyp 
- [x] Client verification

Co-authored-by: Marty Pradere <martyp@labkey.com>
* createSNDCategories now selects existing rows from snd.PkgCategories first
* populateInitialData builds its populateData action URL instead of concatenating with a literal path.
@github-actions github-actions Bot merged commit df214a9 into release26.3 Jul 7, 2026
17 checks passed
@github-actions github-actions Bot deleted the 26.3_ff_bot_26.3.16 branch July 7, 2026 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants