ADAM / AIAHTML5

Merged
Merge Request #940 · created by Nikita Kulshreshtha

sending email from support@interactiveanatomy.com in lab exercise

need to revert the code of users.cs

From LabExEmail1 into Develop

Merged by Nikita Kulshreshtha

1 participants
Inline Side-by-side
Showing 2 changed files
400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
  Edit  View file @a171272
... ... @@ -314,10 +314,10 @@ namespace AIAHTML5.API.Models
314 314 if (UserUtility.CheckIfPropertyExists(userInfo, "accountNumber") && !string.IsNullOrEmpty(userInfo["accountNumber"].ToString()))
315 315 emailMessage += "accountNumber: <b>" + userInfo["accountNumber"].ToString() + "</b><br/><br/>";
316 316  
317   - if (string.IsNullOrEmpty(sender))
  317 + // if (string.IsNullOrEmpty(sender))
318 318 senderEmailId = Convert.ToString(ConfigurationManager.AppSettings["SenderEmailAddress"]);
319   - else
320   - senderEmailId = sender;
  319 + // else
  320 + // senderEmailId = sender;
321 321  
322 322 emailMessage += mailBody;
323 323  
... ...
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
  Edit  View file @a171272
... ... @@ -535,7 +535,10 @@ namespace AIAHTML5.API.Models
535 535  
536 536 intLicenseId = Convert.ToInt32(licRow["Id"]);
537 537  
538   -
  538 + User user = AIAHTML5.API.Models.DBModel.GetUserDetailsByEmailId(userInfo.EmailId);
  539 + userInfo.LoginId = user.LoginId;
  540 + userInfo.Password = user.Password;
  541 +
539 542 DataTable dtblEditionForModesty = new DBModel().GetEditionsForModesty(userInfo.LicenseId, 0);
540 543 //This table result set should return always have 0 or 1 record if modesty mode is present.
541 544 foreach (DataRow drEditionForModesty in dtblEditionForModesty.Rows)
... ...