rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity

Fix a bug: unable to show deleted user in reservation slot

Browse Source
This commit is contained in:
Du Peng 2022-04-05 16:44:55 +02:00
parent 8f3f2ba083
commit 60e9ccd7ce
9 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- Fix a bug: unable to show machine availability slot for admin
- Fix a bug: unable to confirm modification of reservation for client
- Fix a bug: unable to show deleted user in reservation slot
## v5.3.9 2022 April 01

3
app/services/availabilities/status_service.rb
View File

@ -18,7 +18,8 @@ class Availabilities::StatusService
slot.id = s.id
slot.is_reserved = true
slot.title = "#{slot.machine.name} - #{@show_name ? r.user&.profile&.full_name : I18n.t('availabilities.not_available')}"
user_name = r.user ? r.user&.profile&.full_name : I18n.t('availabilities.deleted_user');
slot.title = "#{slot.machine.name} - #{@show_name ? user_name : I18n.t('availabilities.deleted_user')}"
slot.can_modify = true if %w[admin manager].include?(@current_user_role)
slot.reservations.push r

1
config/locales/de.yml
View File

@ -53,6 +53,7 @@ de:
i_ve_reserved: "Ich reservierte"
length_must_be_slot_multiple: "muss mindestens %{MIN} Minuten nach dem Startdatum liegen"
must_be_associated_with_at_least_1_machine: "muss mindestens einer Maschine zugeordnet sein"
deleted_user: "Deleted user"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "Die Gruppe kann während eines Abonnements nicht geändert werden"

1
config/locales/en.yml
View File

@ -53,6 +53,7 @@ en:
i_ve_reserved: "I've reserved"
length_must_be_slot_multiple: "must be at least %{MIN} minutes after the start date"
must_be_associated_with_at_least_1_machine: "must be associated with at least 1 machine"
deleted_user: "Deleted user"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "Unable to change the group while a subscription is running"

1
config/locales/es.yml
View File

@ -53,6 +53,7 @@ es:
i_ve_reserved: "He reservado"
length_must_be_slot_multiple: "Debe ser al menos %{MIN} minutos después de la fecha de inicio"
must_be_associated_with_at_least_1_machine: "debe estar asociado con al menos 1 máquina"
deleted_user: "Deleted user"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "No se puede cambiar de grupo mientras haya una suscripción en curso"

1
config/locales/fr.yml
View File

@ -53,6 +53,7 @@ fr:
i_ve_reserved: "J'ai réservé"
length_must_be_slot_multiple: "doit être au moins %{MIN} minutes après la date de début"
must_be_associated_with_at_least_1_machine: "doit être associé avec au moins 1 machine"
deleted_user: "Utilisateur supprimé"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "Impossible de changer le groupe tant qu'un abonnement est en cours"

1
config/locales/no.yml
View File

@ -53,6 +53,7 @@
i_ve_reserved: "Jeg har reservert"
length_must_be_slot_multiple: "må være minst %{MIN} minutter etter startdatoen"
must_be_associated_with_at_least_1_machine: "må være tilknyttet minst 1 maskin"
deleted_user: "Deleted user"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "Kan ikke endre gruppen mens et abonnement kjører"

1
config/locales/pt.yml
View File

@ -53,6 +53,7 @@ pt:
i_ve_reserved: "Eu reservei"
length_must_be_slot_multiple: "deve ser pelo menos %{MIN} minutos após a data de início"
must_be_associated_with_at_least_1_machine: "deve estar associada a pelo menos uma máquina"
deleted_user: "Deleted user"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "Não é possível alterar o grupo enquanto uma assinatura está sendo executada"

1
config/locales/zu.yml
View File

@ -53,6 +53,7 @@ zu:
i_ve_reserved: "crwdns3269:0crwdne3269:0"
length_must_be_slot_multiple: "crwdns3271:0%{MIN}crwdne3271:0"
must_be_associated_with_at_least_1_machine: "crwdns3273:0crwdne3273:0"
deleted_user: "Deleted user"
#members management
members:
unable_to_change_the_group_while_a_subscription_is_running: "crwdns3275:0crwdne3275:0"