瀏覽代碼

Added username to forgot password and fixed delete user

master
30117125 4 年之前
父節點
當前提交
9e4a20fb32

+ 4
- 1
UnivateProperties_API/Repository/Communication/MailRepository.cs 查看文件

1
-using System;
1
+using Abp.Specifications;
2
+using System;
2
 using System.Collections.Generic;
3
 using System.Collections.Generic;
3
 using System.Linq;
4
 using System.Linq;
4
 using System.Linq.Dynamic.Core;
5
 using System.Linq.Dynamic.Core;
144
 
145
 
145
         public void ForgotPassword(Individual toPerson, string link)
146
         public void ForgotPassword(Individual toPerson, string link)
146
         {
147
         {
148
+            
147
             string body = "<div style=\"margin: 5px\">" + 
149
             string body = "<div style=\"margin: 5px\">" + 
148
                            "<h4>Dear " + toPerson.FullName + "</h4>" +
150
                            "<h4>Dear " + toPerson.FullName + "</h4>" +
149
                            "<h4>There has been a request to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
151
                            "<h4>There has been a request to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
152
+                           "<h4>Once your password has been reset you can use the username "+ toPerson.User.Username + " and the new password to log in.</h4>" +
150
                            "<div>" +
153
                            "<div>" +
151
                            "<h4><a href='" + link + "'>Click here</a> to reset your password.</h4>" +
154
                            "<h4><a href='" + link + "'>Click here</a> to reset your password.</h4>" +
152
                            "<br />"+
155
                            "<br />"+

+ 1
- 1
UnivateProperties_API/Repository/Users/IndividualRepository.cs 查看文件

29
             {
29
             {
30
                 var list = MyCommon.GetVisibleColumns(item);
30
                 var list = MyCommon.GetVisibleColumns(item);
31
             }
31
             }
32
-            return _dbContext.Individuals.Include("User").Include("Address").ToList();
32
+            return _dbContext.Individuals.Include("User").Include("Address").Where(x => x.IsDeleted == false).ToList();
33
         }
33
         }
34
 
34
 
35
         public Individual GetDetailed(Func<Individual, bool> first)
35
         public Individual GetDetailed(Func<Individual, bool> first)

Loading…
取消
儲存