diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-01-19 12:05:37 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-01-19 12:05:37 +0200 |
| commit | 09d432566f696f0eeb3fce97d2c870cfd1c91f89 (patch) | |
| tree | 5a359c890a2b4eaa354d304e1bc188828d691be9 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs | |
| parent | 13b01cc6e2539dae0063f8cf23909e07982dfbb9 (diff) | |
| download | Tango-09d432566f696f0eeb3fce97d2c870cfd1c91f89.tar.gz Tango-09d432566f696f0eeb3fce97d2c870cfd1c91f89.zip | |
Improved ms logging screen.
Improved ObservableStaticCollection init speed.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs index 9c2367f93..dce469dbd 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -116,7 +116,12 @@ namespace Tango.MachineStudio.UI.ViewModels set { _isStandardUser = value; RaisePropertyChangedAuto(); if (value) IsActiveDirectory = false; } } - + private String _progressLog; + public String ProgressLog + { + get { return _progressLog; } + set { _progressLog = value; RaisePropertyChangedAuto(); } + } /// <summary> /// Gets or sets the login command. @@ -146,7 +151,7 @@ namespace Tango.MachineStudio.UI.ViewModels Email = _settings.LastLoginEmail; DeploymentSlot = _settings.DeploymentSlot; RememberMe = _settings.RememberMe; - + if (_settings.LastLoginMethod == LoginMethod.ActiveDirectory) { IsActiveDirectory = true; @@ -184,7 +189,10 @@ namespace Tango.MachineStudio.UI.ViewModels { _settings.DeploymentSlot = DeploymentSlot; - LoginResponse result = _authenticationProvider.Login(Email, Password, loginMethod, _settings.ByPassEnvironmentVersionCheck).Response; + LoginResponse result = _authenticationProvider.Login(Email, Password, loginMethod, _settings.ByPassEnvironmentVersionCheck, (progress) => + { + ProgressLog = progress; + }).Response; if (result.VersionChangeRequired && !_settings.ByPassEnvironmentVersionCheck) { |