diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-01-16 13:45:38 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-01-16 13:45:38 +0200 |
| commit | 994456523c7adf2f77dd7f74c639262b59d56ec4 (patch) | |
| tree | e238062693ee5e877a86a777cc279498cb31ab0b /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer | |
| parent | 09e4d329538f348c759534f282f2a6ed3bb42420 (diff) | |
| parent | 1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e (diff) | |
| download | Tango-994456523c7adf2f77dd7f74c639262b59d56ec4.tar.gz Tango-994456523c7adf2f77dd7f74c639262b59d56ec4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml index c9c7a4efc..16d312da4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml @@ -190,8 +190,8 @@ </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> <DataGridTextColumn SortDirection="Descending" Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" /> - <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.EventTypesGroup.Name}" /> - <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" /> + <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" /> + <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" /> <DataGridTemplateColumn Header="MESSAGE" Width="1*"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> |