From 338edba081dba2a2aefb634811be1cc84ec93d64 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Tue, 25 Aug 2020 10:08:01 +0300
Subject: merge

---
 .../Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
index 3964abfc8..2a8621e5c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
@@ -14,6 +14,7 @@
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+              xmlns:localconverters="clr-namespace:Tango.MachineStudio.UsersAndRoles.Converters"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
@@ -21,6 +22,7 @@
         <providers:PlacesProvider x:Key="PlacesProvider" />
         <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"></converters:BooleanToVisibilityConverter>
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter"></converters:BooleanToVisibilityInverseConverter>
+        <localconverters:RoleEnumToVisibleConverter x:Key="RoleEnumToVisibleConverter"/>
     </UserControl.Resources>
     
     <Grid>
@@ -103,7 +105,7 @@
                                         </ListBox.ItemsPanel>
                                         <ListBox.ItemTemplate>
                                             <DataTemplate DataType="{x:Type entities:Role}">
-                                                <Grid>
+                                                <Grid Visibility="{Binding RoleEnum, Converter={StaticResource RoleEnumToVisibleConverter}}">
                                                     <Grid.ToolTip>
                                                         <StackPanel Background="Transparent">
                                                             <TextBlock Text="{Binding Description}" FontSize="10" Margin="0 0 0 10"></TextBlock>
@@ -175,7 +177,7 @@
                         <ListBox ItemsSource="{Binding Roles}" ItemContainerStyle="{StaticResource basicListBoxItem}" HorizontalContentAlignment="Stretch" Background="Transparent">
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <Grid Background="Transparent" IsHitTestVisible="True" Style="{StaticResource draggableGrid}" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                    <Grid Background="Transparent" IsHitTestVisible="True" Style="{StaticResource draggableGrid}" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}" Visibility="{Binding RoleEnum, Converter={StaticResource RoleEnumToVisibleConverter}}">
                                         <Grid.ToolTip>
                                             <StackPanel Background="Transparent">
                                                 <TextBlock Text="{Binding Description}" FontSize="10" Margin="0 0 0 10"></TextBlock>
-- 
cgit v1.3.1