diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-10-03 17:34:26 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-10-03 17:34:26 +0300 |
| commit | 7e0877f955307204957c78aa7ad1cfd60e3d9004 (patch) | |
| tree | dcfc8d6b5acd8ad726278de22c55f3e955c142f7 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels | |
| parent | fa8ac9f8559a1e6e56b1bd9247da9828b8fedbb1 (diff) | |
| parent | 00859f5f1ee871007120d4fa9dc534fb67be242c (diff) | |
| download | Tango-7e0877f955307204957c78aa7ad1cfd60e3d9004.tar.gz Tango-7e0877f955307204957c78aa7ad1cfd60e3d9004.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
2 files changed, 8 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index 5e44bf43d..165841905 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -8,6 +8,7 @@ using Tango.Core.DI; using Tango.Emulations.ExternalBridge; using Tango.Integration.ExternalBridge; using Tango.MachineStudio.Common; +using Tango.MachineStudio.Common.Authentication; using Tango.MachineStudio.Common.Notifications; using Tango.Settings; using Tango.SharedUI; @@ -104,6 +105,7 @@ namespace Tango.MachineStudio.UI.ViewModels try { _scanner.AvailableMachines.Clear(); + _scanner.SignalRConfiguration.Enabled = !TangoIOC.Default.GetInstance<IAuthenticationProvider>().CurrentUser.PreventRemoteMachineAccess; if (SettingsManager.Default.GetOrCreate<MachineStudioSettings>().UseExternalBridgeEmulator) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 4f8c8a9b1..0550383fb 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -456,6 +456,12 @@ namespace Tango.MachineStudio.UI.ViewModels { if (x.SelectedMachine != null) { + if (x.SelectedMachine.GetType() == typeof(ExternalBridgeSignalRClient) && AuthenticationProvider.CurrentUser.PreventRemoteMachineAccess) + { + _notificationProvider.ShowError("You are not allowed to connect to machines through the Internet. Please contact your administrator."); + return; + } + if (ApplicationManager.IsMachineConnected) { using (_notificationProvider.PushTaskItem("Disconnecting...")) |