Skip to content

Add TimestampCreated fix to main #7162

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
CarolineDenis merged 2 commits into from
Jul 21, 2025
Merged

Add TimestampCreated fix to main #7162

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
97a98bd
Update execution.py
acwhite211 Jul 21, 2025
01d9571
Update Wrapped.tsx
acwhite211 Jul 21, 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
8 changes: 8 additions & 0 deletions specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,14 @@ function Wrapped({
[state, table.name]
);

React.useEffect(() => {
if (!showSeries)
setQuery({
...query,
smushed: false,
});
}, [showSeries]);

return treeRanksLoaded ? (
<ReadOnlyContext.Provider value={isReadOnly}>
<IsQueryBasicContext.Provider value={isBasic}>
Expand Down
4 changes: 2 additions & 2 deletions specifyweb/stored_queries/execution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ def build_query(
id_field = model._id
catalog_number_field = model.catalogNumber if hasattr(model, 'catalogNumber') else None

# field_specs = [apply_absolute_date(field_spec) for field_spec in field_specs]
field_specs = [apply_absolute_date(field_spec) for field_spec in field_specs]
field_specs = [apply_specify_user_name(field_spec, user) for field_spec in field_specs]

query_construct_query = session.query(id_field)
Expand Down Expand Up @@ -1237,4 +1237,4 @@ def cog_inheritance_post_query_processing(query, tableid, field_specs, collectio

return updated_results

return query
return query