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

fix duplicate entries showing up

Browse Source
This commit is contained in:
shibao 2023-03-19 13:28:56 -04:00
parent b32edd581d
commit 213dcca973
11 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
# v0.8.6
- Fix duplicate entries showing up
# v0.8.5
- Add link in readme to github mirror
- Fix tables unable to sort on empty dates

3
lib/cannery/activity_log.ex
View File

@ -60,7 +60,8 @@ defmodule Cannery.ActivityLog do
sg.search,
^trimmed_search
)
}
},
distinct: sg.id
)
end

1
lib/cannery/ammo.ex
View File

@ -715,6 +715,7 @@ defmodule Cannery.Ammo do
on: c.user_id == t.user_id,
as: :t,
where: ag.user_id == ^user_id,
distinct: ag.id,
preload: ^@ammo_group_preloads
)
|> list_ammo_groups_include_empty(include_empty)

1
lib/cannery/containers.ex
View File

@ -32,6 +32,7 @@ defmodule Cannery.Containers do
as: :t,
where: c.user_id == ^user_id,
order_by: c.name,
distinct: c.id,
preload: ^@container_preloads
)
|> list_containers_search(search)

2
mix.exs
View File

@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
def project do
[
app: :cannery,
version: "0.8.5",
version: "0.8.6",
elixir: "1.14.1",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: Mix.compilers(),

4
priv/gettext/de/LC_MESSAGES/errors.po
View File

@ -23,7 +23,7 @@ msgstr ""
## Run "mix gettext.extract" to bring this file up to
## date. Leave "msgstr"s empty as changing them here has no
## effect: edit them in PO (.po) files instead.
#: lib/cannery/containers.ex:200
#: lib/cannery/containers.ex:201
#, elixir-autogen, elixir-format
msgid "Container must be empty before deleting"
msgstr "Behälter muss vor dem Löschen leer sein"
@ -172,7 +172,7 @@ msgstr ""
"Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
"%{multiplier}"
#: lib/cannery/ammo.ex:1015
#: lib/cannery/ammo.ex:1016
#, elixir-autogen, elixir-format
msgid "Invalid multiplier"
msgstr ""

4
priv/gettext/en/LC_MESSAGES/errors.po
View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Language: en\n"
#: lib/cannery/containers.ex:200
#: lib/cannery/containers.ex:201
#, elixir-autogen, elixir-format
msgid "Container must be empty before deleting"
msgstr ""
@ -155,7 +155,7 @@ msgstr ""
msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
msgstr ""
#: lib/cannery/ammo.ex:1015
#: lib/cannery/ammo.ex:1016
#, elixir-autogen, elixir-format
msgid "Invalid multiplier"
msgstr ""

4
priv/gettext/errors.pot
View File

@ -10,7 +10,7 @@
msgid ""
msgstr ""
#: lib/cannery/containers.ex:200
#: lib/cannery/containers.ex:201
#, elixir-autogen, elixir-format
msgid "Container must be empty before deleting"
msgstr ""
@ -154,7 +154,7 @@ msgstr ""
msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
msgstr ""
#: lib/cannery/ammo.ex:1015
#: lib/cannery/ammo.ex:1016
#, elixir-autogen, elixir-format
msgid "Invalid multiplier"
msgstr ""

4
priv/gettext/es/LC_MESSAGES/errors.po
View File

@ -23,7 +23,7 @@ msgstr ""
## Run "mix gettext.extract" to bring this file up to
## date. Leave "msgstr"s empty as changing them here has no
## effect: edit them in PO (.po) files instead.
#: lib/cannery/containers.ex:200
#: lib/cannery/containers.ex:201
#, elixir-autogen, elixir-format
msgid "Container must be empty before deleting"
msgstr "El contenedor debe estar vacío antes de ser borrado"
@ -170,7 +170,7 @@ msgstr "No se ha podido procesar el número de copias"
msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
msgstr "Número inválido de copias, debe ser entre 1 y %{max}. Fue %{multiplier"
#: lib/cannery/ammo.ex:1015
#: lib/cannery/ammo.ex:1016
#, elixir-autogen, elixir-format
msgid "Invalid multiplier"
msgstr "Multiplicador inválido"

4
priv/gettext/fr/LC_MESSAGES/errors.po
View File

@ -23,7 +23,7 @@ msgstr ""
# # Run "mix gettext.extract" to bring this file up to
# # date. Leave "msgstr"s empty as changing them here has no
# # effect: edit them in PO (.po) files instead.
#: lib/cannery/containers.ex:200
#: lib/cannery/containers.ex:201
#, elixir-autogen, elixir-format
msgid "Container must be empty before deleting"
msgstr "Le conteneur doit être vide pour être supprimé"
@ -171,7 +171,7 @@ msgstr "Impossible d'analyser le nombre de copies"
msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}"
#: lib/cannery/ammo.ex:1015
#: lib/cannery/ammo.ex:1016
#, elixir-autogen, elixir-format
msgid "Invalid multiplier"
msgstr "Multiplicateur invalide"

4
priv/gettext/ga/LC_MESSAGES/errors.po
View File

@ -24,7 +24,7 @@ msgstr ""
## Run "mix gettext.extract" to bring this file up to
## date. Leave "msgstr"s empty as changing them here has no
## effect: edit them in PO (.po) files instead.
#: lib/cannery/containers.ex:200
#: lib/cannery/containers.ex:201
#, elixir-autogen, elixir-format
msgid "Container must be empty before deleting"
msgstr "Caithfidh an coimeádán a bheidh follamh roimh scriosadh"
@ -170,7 +170,7 @@ msgstr ""
msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
msgstr ""
#: lib/cannery/ammo.ex:1015
#: lib/cannery/ammo.ex:1016
#, elixir-autogen, elixir-format
msgid "Invalid multiplier"
msgstr ""