diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-27 13:35:45 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-27 13:35:45 +0300 |
| commit | ec02fe9b944cdabf2fce23c91ae16bf2f1383276 (patch) | |
| tree | 113fdfde4af1dd06b7ce194b10311ebb4794609e /Software/Visual_Studio/MachineStudio | |
| parent | 06e3b34d1908077694625e122e85aae7f3483a62 (diff) | |
| parent | bd438b5192763ad6a9b56af2f4fad3b7b071ce90 (diff) | |
| download | Tango-ec02fe9b944cdabf2fce23c91ae16bf2f1383276.tar.gz Tango-ec02fe9b944cdabf2fce23c91ae16bf2f1383276.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
2 files changed, 3 insertions, 6 deletions
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 106848b7a..e2bba2d1d 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 @@ -1661,7 +1661,7 @@ namespace Tango.MachineStudio.Developer.ViewModels } else { - stop.StopIndex = 0; + stop.StopIndex = 1; } stop.OffsetPercent = 100; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs index b90a03c1d..49521fb1d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs @@ -60,8 +60,7 @@ namespace Tango.MachineStudio.UpdateService db.UsersRoles.ToList(); db.RolesPermissions.ToList(); - String hash = User.GetPasswordHash(request.Password); - var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == hash); + var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); if (user != null && user.HasPermission(Permissions.RunMachineStudio) || (request.Email == "ForceUpdate")) { @@ -111,9 +110,7 @@ namespace Tango.MachineStudio.UpdateService db.UsersRoles.ToList(); db.RolesPermissions.ToList(); - String hash = User.GetPasswordHash(request.Password); - - var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == hash); + var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion)) { |