diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-26 20:09:38 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-26 20:09:38 +0300 |
| commit | 7d7281f91edfb2d0e7d0e92bd282403f0426f94d (patch) | |
| tree | 4672bd653c0abdb6612032a819f670993a31a17a /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | f98cac2d6e331eaf62167d63524134d53db921ef (diff) | |
| download | Tango-7d7281f91edfb2d0e7d0e92bd282403f0426f94d.tar.gz Tango-7d7281f91edfb2d0e7d0e92bd282403f0426f94d.zip | |
Added new colorized static text widget to tech board.
Added option to go back to job/jobs from running job view.
Fixed issue with bug reporting.
Fixed other bugs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
3 files changed, 6 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index 4e1c36593..9c69bee75 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -22,6 +22,7 @@ using Tango.MachineStudio.UI.ViewModels; using Tango.MachineStudio.UI.Views; using Tango.MachineStudio.Common; using Tango.Core; +using Tango.BL; namespace Tango.MachineStudio.UI { @@ -35,6 +36,8 @@ namespace Tango.MachineStudio.UI protected override void OnStartup(StartupEventArgs e) { + ObservableEntityCollectionSettings.SetDispatcher(Application.Current.Dispatcher); + #if DEBUG CoreSettings.DefaultDataSource = new DataSource() diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs index c16f76449..fd68ed8d1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -60,6 +60,8 @@ namespace Tango.MachineStudio.UI.Authentication User user = db.Users .Include(x => x.UsersRoles) + .Include(x => x.Contact) + .Include(x => x.Address) .Include(x => x.Organization).SingleOrDefault(x => x.Email.ToLower() == email.ToLower() && x.Password == hash); if (user == null) diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 2ba2c2d37..067d30413 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("3.1.32.18235")] +[assembly: AssemblyVersion("3.2.35.18238")] [assembly: ComVisible(false)]
\ No newline at end of file |