diff options
-rw-r--r-- | ChangeLog.d/bugfix/ZBX-19669 | 1 | ||||
-rw-r--r-- | ui/app/controllers/CControllerAuthenticationUpdate.php | 3 | ||||
-rw-r--r-- | ui/tests/selenium/testPasswordComplexity.php | 3 |
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') ); |