shibao/cannery
shibao/cannery
1
2
Fork 1
Code Issues 16 Pull Requests Projects 1 Releases 36 Wiki Activity

fix shot record error message

Browse Source
This commit is contained in:
shibao 2023-03-18 01:05:09 -04:00
parent c0441957b6
commit 0b7146ba32
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Improve accessibility - Improve accessibility
- Code quality improvements - Code quality improvements
- Fix dead link of example bullet abbreviations - Fix dead link of example bullet abbreviations
- Fix inaccurate error message when updating shot records
# v0.8.3 # v0.8.3
- Improve some styles - Improve some styles

17
lib/cannery/activity_log/shot_group.ex
View File

@ -115,18 +115,13 @@ defmodule Cannery.ActivityLog.ShotGroup do
new_shot_group_count = changeset |> Changeset.get_field(:count) new_shot_group_count = changeset |> Changeset.get_field(:count)
shot_diff_to_add = new_shot_group_count - count shot_diff_to_add = new_shot_group_count - count
cond do if shot_diff_to_add > ammo_group_count do
shot_diff_to_add > ammo_group_count -> error =
error = dgettext("errors", "Count can be at most %{count} shots", count: ammo_group_count + count)
dgettext("errors", "Count must be less than %{count} shots", count: ammo_group_count)
changeset |> Changeset.add_error(:count, error) changeset |> Changeset.add_error(:count, error)
else
new_shot_group_count <= 0 -> changeset
changeset |> Changeset.add_error(:count, dgettext("errors", "Count must be at least 1"))
true ->
changeset
end end
end end
end end