Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
2e0325e567
commit
b9e48f2102
|
@ -8,7 +8,7 @@ create table `salix`.`authCode`
|
||||||
constraint authCode_unique
|
constraint authCode_unique
|
||||||
unique (code),
|
unique (code),
|
||||||
constraint authCode_user_id_fk
|
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
|
on update cascade on delete cascade
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -22,6 +22,6 @@ create table `salix`.`userAccess`
|
||||||
constraint userAccess_pk
|
constraint userAccess_pk
|
||||||
primary key (userFk),
|
primary key (userFk),
|
||||||
constraint userAccess_user_null_fk
|
constraint userAccess_user_null_fk
|
||||||
foreign key (userFk) references account.user (id)
|
foreign key (userFk) references `account`.`user` (id)
|
||||||
)
|
)
|
||||||
auto_increment = 0;
|
auto_increment = 0;
|
|
@ -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 ;
|
|
@ -1,3 +1,2 @@
|
||||||
alter table `account`.`user`
|
alter table `account`.`user`
|
||||||
add `twoFactor` ENUM ('email') null comment 'Two factor auth type';
|
add `twoFactor` ENUM ('email') null comment 'Two-factor auth type';
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<h5 class="vn-mb-md vn-mt-lg" translate>Enter verification code</h5>
|
<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 label="Code" ng-model="$ctrl.code" type="text" vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
<div class="footer">
|
<div class="footer">
|
||||||
|
|
|
@ -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: $%&.)
|
|
|
@ -1,8 +1,4 @@
|
||||||
Reset password: Restrablecer contraseña
|
Validate email auth: Autenticar email
|
||||||
New password: Nueva contraseña
|
Enter verification code: Introduce código de verificación
|
||||||
Repeat password: Repetir contraseña
|
Code: Código
|
||||||
Password changed!: ¡Contraseña cambiada!
|
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
|
||||||
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: $%&.)
|
|
|
@ -1,6 +1,6 @@
|
||||||
@import "variables";
|
@import "variables";
|
||||||
|
|
||||||
vn-reset-password{
|
vn-validate-email {
|
||||||
.footer {
|
.footer {
|
||||||
margin-top: 32px;
|
margin-top: 32px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
|
@ -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.
|
|
@ -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.
|
Loading…
Reference in New Issue