Merge branch 'master' into feature-16190/Issues_automatisches_Beheben

This commit is contained in:
Andreas Österreicher
2022-02-28 13:07:06 +01:00
23 changed files with 449 additions and 198 deletions
+3 -2
View File
@@ -35,12 +35,12 @@ $filters = array(
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "StgAbgeschickt"},
{"name": "Studiensemester"},
{"name": "LastAction"},
{"name": "LastActionType"},
{"name": "User/Operator"},
{"name": "InfoCenterMitarbeiter"},
{"name": "LockUser"}
{"name": "LockUser"},
{"name": "OnholdDate"}
],
"filters": [
{
@@ -311,6 +311,7 @@ $filters = array(
"columns": [
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "AktenId"},
{"name": "StgAbgeschickt"},
{"name": "LastAction"},
{"name": "LastActionType"},
+23 -3
View File
@@ -896,13 +896,13 @@ $phrases = array(
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'BewerberIn bereits vorhanden',
'text' => 'BewerberIn möglicherweise vorhanden',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Applicant already available',
'text' => 'Applicant maybe available',
'description' => '',
'insertvon' => 'system'
)
@@ -13694,7 +13694,27 @@ array(
'insertvon' => 'system'
)
)
)
),
array(
'app' => 'core',
'category' => 'ui',
'phrase' => 'nurLeseberechtigung',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => "Nur Leseberechtigung",
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => "Read-Only Access",
'description' => '',
'insertvon' => 'system'
)
)
)
);