tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4021 from Icinga/fix/monitoring-permissions-not-correctly-displayed-3996 

Assist browsers in breaking permission and restriction labels onto multiple lines
This commit is contained in:
Johannes Meyer 2019-12-09 08:40:45 +01:00 committed by GitHub
parent f5dc25b5c7 e2bcdd365a
commit f34fb97b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/forms/Security/RoleForm.php
View File

@ -209,7 +209,12 @@ class RoleForm extends RepositoryForm
'autosubmit' => isset($spec['isFullPerm']), 'autosubmit' => isset($spec['isFullPerm']),
'disabled' => $hasFullPerm ?: null, 'disabled' => $hasFullPerm ?: null,
'value' => $hasFullPerm, 'value' => $hasFullPerm,
'label' => isset($spec['label']) ? $spec['label'] : $spec['name'], 'label' => preg_replace(
// Adds a zero-width char after each slash to help browsers break onto newlines
'~(?<!<)/~',
'/&#8203;',
isset($spec['label']) ? $spec['label'] : $spec['name']
),
'description' => isset($spec['description']) ? $spec['description'] : $spec['name'] 'description' => isset($spec['description']) ? $spec['description'] : $spec['name']
] ]
) )
@ -234,7 +239,12 @@ class RoleForm extends RepositoryForm
'text', 'text',
$name, $name,
[ [
'label' => isset($spec['label']) ? $spec['label'] : $spec['name'], 'label' => preg_replace(
// Adds a zero-width char after each slash to help browsers break onto newlines
'~(?<!<)/~',
'/&#8203;',
isset($spec['label']) ? $spec['label'] : $spec['name']
),
'description' => $spec['description'] 'description' => $spec['description']
] ]
) )