Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-13985: "Test Credentails" button on Health Check dialog - changes following code review

Browse Source 
- Button enabled only when "New XS credentials" radio button is ticked and username and password textboxes are not empty
- Button and the textboxes are disabled while the test is in progress
- When test credentials fails, log userName, not UserDisplayName

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2015-09-23 13:26:45 +01:00
parent 4ed8c1c656
commit 12895f7774
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XenAdmin/Dialogs/HealthCheck/HealthCheckSettingsDialog.cs
View File

@ -204,6 +204,8 @@ namespace XenAdmin.Dialogs.HealthCheck
private void radioButton2_CheckedChanged(object sender, EventArgs e)
{
SetXSCredentials(currentXsCredentialsRadioButton.Checked);
testCredentialsButton.Enabled = newXsCredentialsRadioButton.Checked &&
!string.IsNullOrEmpty(textboxXSUserName.Text) && !string.IsNullOrEmpty(textboxXSPassword.Text);
}
private void SetXSCredentials(bool useCurrent)
@ -353,11 +355,13 @@ namespace XenAdmin.Dialogs.HealthCheck
ShowTestCredentialsStatus(Resources._000_Tick_h32bit_16, null);
else
ShowTestCredentialsStatus(Resources._000_error_h32bit_16, action.Exception != null ? action.Exception.Message : Messages.HEALTH_CHECK_USER_NOT_AUTHORIZED);
textboxXSUserName.Enabled = textboxXSPassword.Enabled = testCredentialsButton.Enabled = newXsCredentialsRadioButton.Checked;
});
};
log.Debug("Testing logging in with the new credentials");
ShowTestCredentialsStatus(Resources.ajax_loader, null);
textboxXSUserName.Enabled = textboxXSPassword.Enabled = testCredentialsButton.Enabled = false;
action.RunAsync();
}
@ -382,11 +386,11 @@ namespace XenAdmin.Dialogs.HealthCheck
{
if (authorizedRoles.Contains(r))
{
log.DebugFormat("Subject '{0}' is authorized to complete the action", ud.UserDisplayName ?? ud.UserName ?? ud.UserSid);
log.DebugFormat("Subject '{0}' is authorized to complete the action", ud.UserName ?? ud.UserSid);
return true;
}
}
log.DebugFormat("Subject '{0}' is not authorized to complete the action", ud.UserDisplayName ?? ud.UserName ?? ud.UserSid);
log.DebugFormat("Subject '{0}' is not authorized to complete the action", ud.UserName ?? ud.UserSid);
return false;
}
}