Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Kurzemnieks <ivo.kurzemnieks@zabbix.com>2022-01-07 12:04:15 +0300
committerIvo Kurzemnieks <ivo.kurzemnieks@zabbix.com>2022-01-07 12:04:15 +0300
commit503c433cba8ada1285d6cbf7cdaa913d2772c4a0 (patch)
tree64392bed14150571ce505fc672fb9da7eee50705
parent42ee64791a099c56f44e014f5b39352ebc74b575 (diff)
parent05c4d2f1e32c21a38338ccbcb0a10b3b0d9fbe03 (diff)
..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page
* commit '05c4d2f1e32c21a38338ccbcb0a10b3b0d9fbe03': .......... [ZBX-19669] removed outdated TODO ..F....... [ZBX-19669] fixed fatal error ..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page
-rw-r--r--ChangeLog.d/bugfix/ZBX-196691
-rw-r--r--ui/app/controllers/CControllerAuthenticationUpdate.php3
-rw-r--r--ui/tests/selenium/testPasswordComplexity.php3
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-19669 b/ChangeLog.d/bugfix/ZBX-19669
new file mode 100644
index 00000000000..3fbdc53a8b8
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-19669
@@ -0,0 +1 @@
+..F....... [ZBX-19669] fixed success message not showing when no fields were changed in Administration->Authentication page (Ivo)
diff --git a/ui/app/controllers/CControllerAuthenticationUpdate.php b/ui/app/controllers/CControllerAuthenticationUpdate.php
index 33c848fdd07..15d420e0050 100644
--- a/ui/app/controllers/CControllerAuthenticationUpdate.php
+++ b/ui/app/controllers/CControllerAuthenticationUpdate.php
@@ -397,6 +397,9 @@ class CControllerAuthenticationUpdate extends CController {
CMessageHelper::setErrorTitle(_('Cannot update authentication'));
}
}
+ else {
+ CMessageHelper::setSuccessTitle(_('Authentication settings updated'));
+ }
$this->setResponse($this->response);
}
diff --git a/ui/tests/selenium/testPasswordComplexity.php b/ui/tests/selenium/testPasswordComplexity.php
index 4bea93babbf..01e37523229 100644
--- a/ui/tests/selenium/testPasswordComplexity.php
+++ b/ui/tests/selenium/testPasswordComplexity.php
@@ -1044,8 +1044,7 @@ class testPasswordComplexity extends CWebTest {
$auth_form->fill($data['auth_fields']);
$auth_form->submit();
$this->page->waitUntilReady();
- // TODO: Uncomment this when ZBX-19669 is fixed.
-// $this->assertMessage(TEST_GOOD, 'Authentication settings updated');
+ $this->assertMessage(TEST_GOOD, 'Authentication settings updated');
$this->assertEquals($data['db_passwd_check_rules'],
CDBHelper::getValue('SELECT passwd_check_rules FROM config')
);