Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2023-04-11 07:39:43 +02:00
parent 2e0325e567
commit b9e48f2102
9 changed files with 43 additions and 18 deletions

View File

@ -8,7 +8,7 @@ create table `salix`.`authCode`
constraint authCode_unique
unique (code),
constraint authCode_user_id_fk
foreign key (userFk) references account.user (id)
foreign key (userFk) references `account`.`user` (id)
on update cascade on delete cascade
);
@ -22,6 +22,6 @@ create table `salix`.`userAccess`
constraint userAccess_pk
primary key (userFk),
constraint userAccess_user_null_fk
foreign key (userFk) references account.user (id)
foreign key (userFk) references `account`.`user` (id)
)
auto_increment = 0;

View File

@ -0,0 +1,24 @@
alter table `vn`.`department`
add `twoFactor` ENUM ('email') null comment 'Default user tow-factor auth type';
drop trigger `vn`.`department_afterUpdate`;
DELIMITER $$
$$
create definer = root@localhost trigger department_afterUpdate
after update
on department
for each row
BEGIN
IF !(OLD.parentFk <=> NEW.parentFk) THEN
UPDATE vn.department_recalc SET isChanged = TRUE;
END IF;
IF !(OLD.twoFactor <=> NEW.twoFactor) THEN
UPDATE account.user u
JOIN vn.workerDepartment wd ON wd.workerFk = u.id
SET u.twoFactor = NEW.twoFactor
WHERE wd.departmentFk = NEW.id;
END IF;
END;$$
DELIMITER ;

View File

@ -1,3 +1,2 @@
alter table `account`.`user`
add `twoFactor` ENUM ('email') null comment 'Two factor auth type';
add `twoFactor` ENUM ('email') null comment 'Two-factor auth type';

View File

@ -1,5 +1,5 @@
<h5 class="vn-mb-md vn-mt-lg" translate>Enter verification code</h5>
<span>Please enter the verification code that we have sent to your email address within 5 minutes.</span>
<span translate>Please enter the verification code that we have sent to your email address within 5 minutes</span>
<vn-textfield label="Code" ng-model="$ctrl.code" type="text" vn-focus>
</vn-textfield>
<div class="footer">

View File

@ -1,4 +0,0 @@
Password requirements: >
The password must have at least {{ length }} length characters,
{{nAlpha}} alphabetic characters, {{nUpper}} capital letters, {{nDigits}}
digits and {{nPunct}} symbols (Ex: $%&.)

View File

@ -1,8 +1,4 @@
Reset password: Restrablecer contraseña
New password: Nueva contraseña
Repeat password: Repetir contraseña
Password changed!: ¡Contraseña cambiada!
Password requirements: >
La contraseña debe tener al menos {{ length }} caracteres de longitud,
{{nAlpha}} caracteres alfabéticos, {{nUpper}} letras mayúsculas, {{nDigits}}
dígitos y {{nPunct}} símbolos (Ej: $%&.)
Validate email auth: Autenticar email
Enter verification code: Introduce código de verificación
Code: Código
Please enter the verification code that we have sent to your email address within 5 minutes: Por favor, introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos

View File

@ -1,6 +1,6 @@
@import "variables";
vn-reset-password{
vn-validate-email {
.footer {
margin-top: 32px;
text-align: center;

View File

@ -0,0 +1,5 @@
subject: Code de vérification
title: Code de vérification
description: Quelqu'un a demandé un code de vérification pour se connecter. Si ce n'était pas toi, ignore cet email.
Enter the following code to continue to your account: Entrez le code suivant pour continuer avec votre compte
It expires in 5 minutes.: Il expire dans 5 minutes.

View File

@ -0,0 +1,5 @@
subject: Código de verificação
title: Código de verificação
description: Alguém solicitou um código de verificação para entrar. Se você não fez essa solicitação, ignore este e-mail.
Enter the following code to continue to your account: Insira o seguinte código para continuar com sua conta.
It expires in 5 minutes.: Expira em 5 minutos.