diff options
| author | Roy <Roy.mail.net@gmail.com> | 2022-11-27 10:20:48 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2022-11-27 10:20:48 +0200 |
| commit | 70444a5e8db15a474caea5a6fb9d093263fec51a (patch) | |
| tree | f49b18698dd8355b0b83587d47abb687e0bd5af3 /Software/Visual_Studio/FSE/Tango.FSE.UI | |
| parent | 810a75cac71a86452d553a5d06f83fca44f9c0a1 (diff) | |
| download | Tango-70444a5e8db15a474caea5a6fb9d093263fec51a.tar.gz Tango-70444a5e8db15a474caea5a6fb9d093263fec51a.zip | |
Fixes last bugs on RSM.
Diffstat (limited to 'Software/Visual_Studio/FSE/Tango.FSE.UI')
3 files changed, 15 insertions, 8 deletions
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/ApplicationUpdateView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/ApplicationUpdateView.xaml index 7786ac514..047b842e0 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/ApplicationUpdateView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/ApplicationUpdateView.xaml @@ -12,7 +12,7 @@ <StackPanel DockPanel.Dock="Top" Orientation="Horizontal"> <Image Source="/Images/application_update2.png" Width="42" Height="42" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="Fant" /> <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="{StaticResource FSE_LargeFontSize}"> - <Run Text="{Binding BuildProvider.BuildName}"></Run> + <Run Text="{Binding BuildProvider.BuildName,Mode=OneWay}"></Run> <Run>Update</Run> </TextBlock> <TextBlock Foreground="{StaticResource FSE_PrimaryAccentBrush}" Margin="10 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource FSE_LargeFontSize}"> diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs index 344adafe8..534fb3a8c 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/FileSystem/DefaultFileSystemProvider.cs @@ -16,6 +16,7 @@ using Tango.Core.Threading; using Tango.FileSystem; using Tango.FileSystem.Network; using Tango.FSE.Common.Authentication; +using Tango.FSE.Common.Build; using Tango.FSE.Common.Connection; using Tango.FSE.Common.FileSystem; using Tango.FSE.Common.Notifications; @@ -48,6 +49,9 @@ namespace Tango.FSE.UI.FileSystem [TangoInject] private IAuthenticationProvider AuthenticationProvider { get; set; } + [TangoInject(Mode = TangoInjectMode.WhenAvailable)] + private IBuildProvider BuildProvider { get; set; } + #region Properties private bool _enableWebRTC; @@ -590,13 +594,16 @@ namespace Tango.FSE.UI.FileSystem /// <exception cref="FileNotFoundException">Could not locate the local file or directory to upload.</exception> public Task<FileSystemHandler> Upload(String localSourcePath, String remotePath, bool forRemoteUpgrade = false) { - if (!forRemoteUpgrade) + if (!BuildProvider.IsTwineRSM) { - AuthenticationProvider.ThrowIfNoPermission(Permissions.FSE_PPCFileSystemWrite); - } - else - { - AuthenticationProvider.ThrowIfNoPermission(Permissions.FSE_RemoteUpgradeOnline); + if (!forRemoteUpgrade) + { + AuthenticationProvider.ThrowIfNoPermission(Permissions.FSE_PPCFileSystemWrite); + } + else + { + AuthenticationProvider.ThrowIfNoPermission(Permissions.FSE_RemoteUpgradeOnline); + } } String operationId = String.Empty; diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml index ebd56f56d..b897851fc 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml @@ -698,7 +698,7 @@ <ToolTip FontFamily="{StaticResource flexo}" Background="#545454" Foreground="{StaticResource FSE_PrimaryForegroundBrush}" Placement="RelativePoint" PlacementRectangle="330 21 100 100"> <TextBlock TextWrapping="Wrap"> <Run>Sign out from</Run> - <Run Text="{Binding BuildProvider.BuildName}"></Run> + <Run Text="{Binding BuildProvider.BuildName,Mode=OneWay}"></Run> </TextBlock> </ToolTip> </Border.ToolTip> |