Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FOUR-18068 STORY Configure Access for Groups/Users #7334

Merged
merged 1 commit into from
Sep 6, 2024
Merged

FOUR-18068 STORY Configure Access for Groups/Users #7334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion resources/lang/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,5 +2349,7 @@
"No items to show": "Keine Artikel zu zeigen",
"Copy link": "Kopieren Link",
"This actions is taking longer than expected. We will continue updating your tasks in the background.": "Diese Aktion dauert länger als erwartet. Wir werden Ihre Aufgaben weiterhin im Hintergrund aktualisieren.",
"No user selected": "Kein Benutzer ausgewählt"
"No user selected": "Kein Benutzer ausgewählt",
"Encrypted": "Verschlüsselt",
"Users/Groups to View": "Benutzer/Gruppen zum Anzeigen"
}
4 changes: 3 additions & 1 deletion resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,5 +2342,7 @@
"Start": "Start",
"Copy link": "Copy link",
"This actions is taking longer than expected. We will continue updating your tasks in the background.": "This actions is taking longer than expected. We will continue updating your tasks in the background.",
"No user selected": "No user selected"
"No user selected": "No user selected",
"Encrypted": "Encrypted",
"Users/Groups to View": "Users/Groups to View"
}
4 changes: 3 additions & 1 deletion resources/lang/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2346,5 +2346,7 @@
"No items to show": "No hay artículos para mostrar",
"Copy link": "Copiar enlace",
"This actions is taking longer than expected. We will continue updating your tasks in the background.": "Esta acción está tomando más tiempo de lo esperado. Continuaremos actualizando tus tareas en segundo plano.",
"No user selected": "Ningún usuario seleccionado"
"No user selected": "Ningún usuario seleccionado",
"Encrypted": "Encriptado",
"Users/Groups to View": "Usuarios/Grupos que pueden ver"
}
4 changes: 3 additions & 1 deletion resources/lang/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2348,5 +2348,7 @@
"No items to show": "Aucun élément à afficher",
"Copy link": "Copier le lien",
"This actions is taking longer than expected. We will continue updating your tasks in the background.": "Cette action prend plus de temps que prévu. Nous continuerons à mettre à jour vos tâches en arrière-plan.",
"No user selected": "Aucun utilisateur sélectionné"
"No user selected": "Aucun utilisateur sélectionné",
"Encrypted": "Chiffrée",
"Users/Groups to View": "Utilisateurs/Groupes à afficher"
}
3 changes: 2 additions & 1 deletion upgrades/2024_08_26_201558_add_default_key_for_encrypted_fields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

use Illuminate\Encryption\Encrypter;
use ProcessMaker\Models\EncryptedData;
use ProcessMaker\Models\EnvironmentVariable;
use ProcessMaker\Upgrades\UpgradeMigration as Upgrade;

Expand Down Expand Up @@ -67,7 +68,7 @@ protected function removeKeyFromEnvironmentFile()
protected function generateRandomKey()
{
return 'base64:'.base64_encode(
Encrypter::generateKey('AES-256-GCM')
Encrypter::generateKey(EncryptedData::ENCRYPTION_METHOD)
);
}

Expand Down
Loading