diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-24 14:46:55 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-24 14:46:55 +0200 |
| commit | 0fb83fb3abb456ee6707b7f3cabc6b0c1ab2281b (patch) | |
| tree | 6b0076b6c1daacd51c2aab18aaaf15e6edb19d9e /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 2f77ad3cebf771bdf02188174c9712027b004d41 (diff) | |
| download | Tango-0fb83fb3abb456ee6707b7f3cabc6b0c1ab2281b.tar.gz Tango-0fb83fb3abb456ee6707b7f3cabc6b0c1ab2281b.zip | |
Moved all common web components to Tango.Web
Changed app keys names.
Fixed issue with machine studio and the initialization of observables static collections.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
2 files changed, 2 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs index 3293dab3f..450756705 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -65,6 +65,8 @@ namespace Tango.MachineStudio.UI.Authentication ObservablesContext.OverrideSettingsDataSource(response.DataSource); + ObservablesStaticCollections.Instance.Initialize(); + using (ObservablesContext db = ObservablesContext.CreateDefault()) { db.Roles.Load(); 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 4e659d46a..59cc69a57 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -124,7 +124,6 @@ namespace Tango.MachineStudio.UI.ViewModels { _authenticationProvider.Login(Email, Password); - ObservablesStaticCollections.Instance.Initialize(); _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!"); _navigationManager.NavigateTo(NavigationView.MainView); |