From 09b1dd03e5d67453e673789fe0826e7a25d881ab Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 24 Sep 2020 22:28:15 +0300
Subject: Allow null user on jobs. Dropped use of any user on PPC.

---
 .../Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs      | 2 +-
 .../Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 8f02749da..fc0680d9c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1257,7 +1257,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 ||
                 j.Name.ToLower().Contains(filter) //Job name
                 ||
-                j.User.Contact.FirstName.ToLower().Contains(filter) // User first name
+                (j.User != null && j.User.Contact.FirstName.ToLower().Contains(filter)) // User first name
                 ||
                 j.Length.ToString().Contains(filter); //Job length
             };
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 78a7551c0..c7e1d4130 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -193,7 +193,7 @@
                                         <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User.Contact.FirstName">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <TextBlock Text="{Binding User.Contact.FirstName}" VerticalAlignment="Center" FontSize="14"></TextBlock>
+                                                    <TextBlock Text="{Binding User.Contact.FirstName,TargetNullValue='N/A',FallbackValue='N/A'}" VerticalAlignment="Center" FontSize="14"></TextBlock>
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-- 
cgit v1.3.1