Skip to content

Fixed #17796 - search on model name and number on importer#17797

Merged
snipe merged 5 commits intodevelopfrom
#17796-search-on-model-name-and-number
Sep 4, 2025
Merged

Fixed #17796 - search on model name and number on importer#17797
snipe merged 5 commits intodevelopfrom
#17796-search-on-model-name-and-number

Conversation

@snipe
Copy link
Copy Markdown
Member

@snipe snipe commented Sep 3, 2025

This does the comparison on model name and model number for the importer so that models with the same name but different numbers can be imported.

Signed-off-by: snipe <snipe@snipe.net>
@snipe
Copy link
Copy Markdown
Member Author

snipe commented Sep 3, 2025

Hm, not sure why these tests are failing - the import does work as far as I can see.

@snipe
Copy link
Copy Markdown
Member Author

snipe commented Sep 4, 2025

[2025-09-04 11:36:51] testing.DEBUG: Exception caught during checkin email: Attempt to read property "display_name" on null (View: /home/runner/work/snipe-it/snipe-it/resources/views/mail/markdown/checkin-component.blade.php)  

seems like it might be the culprit.

Which is kinda weird since I didn't touch any notifications, and also, it's failing on the asset model import, which doesn't notify anyone.

Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
@snipe
Copy link
Copy Markdown
Member Author

snipe commented Sep 4, 2025

Sigh. Failing on mysql, passing on SQLite, for no reason I can determine. :-/

@snipe
Copy link
Copy Markdown
Member Author

snipe commented Sep 4, 2025

I cannot get the ConsumableFileTest to fail locally.

@snipe snipe merged commit 1109db7 into develop Sep 4, 2025
3 of 6 checks passed
@snipe snipe deleted the #17796-search-on-model-name-and-number branch September 4, 2025 15:35
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.

1 participant