Remove restriction macro `user:local_name`
This commit is contained in:
parent
46a21d9709
commit
f8e1137060
|
@ -159,9 +159,6 @@ this, put the macro `$user.local_name$` in the restriction where you want it to
|
||||||
This can come in handy if you have e.g. an attribute on hosts or services defining which user is responsible for it:
|
This can come in handy if you have e.g. an attribute on hosts or services defining which user is responsible for it:
|
||||||
`_host_deputy=$user.local_name$|_service_deputy=$user.local_name$`
|
`_host_deputy=$user.local_name$|_service_deputy=$user.local_name$`
|
||||||
|
|
||||||
> Please note that since version 2.9 the use of `user.local_name` instead of `user:local_name` is supported and
|
|
||||||
> recommended. `user:local_name` is deprecated and will be removed in version 2.11.
|
|
||||||
|
|
||||||
### Filter Expressions
|
### Filter Expressions
|
||||||
|
|
||||||
Filters operate on columns. A complete list of all available filter columns on hosts and services can be found in
|
Filters operate on columns. A complete list of all available filter columns on hosts and services can be found in
|
||||||
|
|
|
@ -16,6 +16,10 @@ v2.6 to v2.8 requires to follow the instructions for v2.7 too.
|
||||||
In package installations this file can be found in `/usr/share/doc/icingaweb2/schema/*-upgrades/`
|
In package installations this file can be found in `/usr/share/doc/icingaweb2/schema/*-upgrades/`
|
||||||
(Debian/Ubuntu: `/usr/share/icingaweb2/etc/schema/*-upgrades/`).
|
(Debian/Ubuntu: `/usr/share/icingaweb2/etc/schema/*-upgrades/`).
|
||||||
|
|
||||||
|
**Breaking changes**
|
||||||
|
|
||||||
|
* The `user:local_name` macro in restrictions has been removed. Use `user.local_name` now.
|
||||||
|
|
||||||
**Framework changes affecting third-party code**
|
**Framework changes affecting third-party code**
|
||||||
|
|
||||||
* All the following deprecated php classes and methods are removed:
|
* All the following deprecated php classes and methods are removed:
|
||||||
|
@ -46,7 +50,6 @@ v2.6 to v2.8 requires to follow the instructions for v2.7 too.
|
||||||
+ `Icinga\Util\Translator`: Use `\ipl\I18n\StaticTranslator::$instance` or `\ipl\I18n\Translation` instead.
|
+ `Icinga\Util\Translator`: Use `\ipl\I18n\StaticTranslator::$instance` or `\ipl\I18n\Translation` instead.
|
||||||
+ `Icinga\Module\Migrate\Clicommands\DashboardCommand`
|
+ `Icinga\Module\Migrate\Clicommands\DashboardCommand`
|
||||||
|
|
||||||
|
|
||||||
* All the following deprecated js classes and methods are removed:
|
* All the following deprecated js classes and methods are removed:
|
||||||
|
|
||||||
**Methods:**
|
**Methods:**
|
||||||
|
|
|
@ -204,11 +204,8 @@ class AdmissionLoader
|
||||||
|
|
||||||
$roleRestrictions = $role->getRestrictions();
|
$roleRestrictions = $role->getRestrictions();
|
||||||
foreach ($roleRestrictions as $name => & $restriction) {
|
foreach ($roleRestrictions as $name => & $restriction) {
|
||||||
// TODO(el): user.local_name is supported since version 2.9.
|
|
||||||
// and therefore user:local_name is deprecated.
|
|
||||||
// The latter will be removed in version 2.11.
|
|
||||||
$restriction = str_replace(
|
$restriction = str_replace(
|
||||||
['$user.local_name$', '$user:local_name$'],
|
'$user.local_name$',
|
||||||
$user->getLocalUsername(),
|
$user->getLocalUsername(),
|
||||||
$restriction
|
$restriction
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue