tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaServiceForm: use "re/deactivate" (wording)

Browse Source 
fixes #2135
This commit is contained in:
Thomas Gelf 2020-06-06 22:24:40 +02:00
parent 98aafeb535
commit 6736e3296e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/forms/IcingaServiceForm.php
View File

@ -132,12 +132,12 @@ class IcingaServiceForm extends DirectorObjectForm
Html::tag( Html::tag(
'p', 'p',
['class' => 'warning'], ['class' => 'warning'],
$this->translate('This Service has been blacklisted on this host') $this->translate('This Service has been deactivated on this host')
), ),
['name' => 'HINT_blacklisted'] ['name' => 'HINT_blacklisted']
); );
$group = null; $group = null;
$this->addDeleteButton($this->translate('Restore')); $this->addDeleteButton($this->translate('Reactivate'));
$this->setSubmitLabel(false); $this->setSubmitLabel(false);
} else { } else {
$this->addOverrideHint(); $this->addOverrideHint();
@ -158,7 +158,7 @@ class IcingaServiceForm extends DirectorObjectForm
$this->setSubmitLabel(false); $this->setSubmitLabel(false);
} }
$this->addDeleteButton($this->translate('Blacklist')); $this->addDeleteButton($this->translate('Deactivate'));
} }
if (! $this->hasSubmitButton()) { if (! $this->hasSubmitButton()) {
@ -188,6 +188,7 @@ class IcingaServiceForm extends DirectorObjectForm
*/ */
protected function getFirstParent(IcingaService $service) protected function getFirstParent(IcingaService $service)
{ {
/** @var IcingaService[] $objects */
$objects = $service->imports()->getObjects(); $objects = $service->imports()->getObjects();
if (empty($objects)) { if (empty($objects)) {
throw new RuntimeException('Something went wrong, got no parent'); throw new RuntimeException('Something went wrong, got no parent');
@ -262,7 +263,7 @@ class IcingaServiceForm extends DirectorObjectForm
'service_id' => $service->get('id') 'service_id' => $service->get('id')
])) { ])) {
$msg = sprintf( $msg = sprintf(
$this->translate('%s has been blacklisted on %s'), $this->translate('%s has been deactivated on %s'),
$service->getObjectName(), $service->getObjectName(),
$host->getObjectName() $host->getObjectName()
); );
@ -298,7 +299,7 @@ class IcingaServiceForm extends DirectorObjectForm
]); ]);
if ($db->delete('icinga_host_service_blacklist', $where)) { if ($db->delete('icinga_host_service_blacklist', $where)) {
$msg = sprintf( $msg = sprintf(
$this->translate('%s is no longer blacklisted on %s'), $this->translate('%s is no longer deactivated on %s'),
$service->getObjectName(), $service->getObjectName(),
$host->getObjectName() $host->getObjectName()
); );

2
doc/82-Changelog.md
View File

@ -14,7 +14,7 @@ next (will be 1.8.0)
### User Interface ### User Interface
* FIX: It's now possible to set Endpoint ports > 32767 on PostgreSQL (#928) * FIX: It's now possible to set Endpoint ports > 32767 on PostgreSQL (#928)
* FIX: Group list is no longer prefixed with a comma (#2133) * FIX: Group list is no longer prefixed with a comma (#2133)
* FIX: Change wording, avoid black/whitelist (#2134) * FIX: Change wording, avoid black/whitelist (#2134, #2135)
* FEATURE: Data Fields can now be grouped into categories (#1969) * FEATURE: Data Fields can now be grouped into categories (#1969)
* FEATURE: Inspect is now available for Packages, Stages and Files (#1995) * FEATURE: Inspect is now available for Packages, Stages and Files (#1995)
* FEATURE: Allow to disable the Director frontend / UI (#2007) * FEATURE: Allow to disable the Director frontend / UI (#2007)