Pārlūkot izejas kodu

Added username to forgot password and fixed delete user

master
30117125 4 gadus atpakaļ
vecāks
revīzija
9e4a20fb32

+ 4
- 1
UnivateProperties_API/Repository/Communication/MailRepository.cs Parādīt failu

@@ -1,4 +1,5 @@
1
-using System;
1
+using Abp.Specifications;
2
+using System;
2 3
 using System.Collections.Generic;
3 4
 using System.Linq;
4 5
 using System.Linq.Dynamic.Core;
@@ -144,9 +145,11 @@ namespace UnivateProperties_API.Repository.Communication
144 145
 
145 146
         public void ForgotPassword(Individual toPerson, string link)
146 147
         {
148
+            
147 149
             string body = "<div style=\"margin: 5px\">" + 
148 150
                            "<h4>Dear " + toPerson.FullName + "</h4>" +
149 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 153
                            "<div>" +
151 154
                            "<h4><a href='" + link + "'>Click here</a> to reset your password.</h4>" +
152 155
                            "<br />"+

+ 1
- 1
UnivateProperties_API/Repository/Users/IndividualRepository.cs Parādīt failu

@@ -29,7 +29,7 @@ namespace UnivateProperties_API.Repository.Users
29 29
             {
30 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 35
         public Individual GetDetailed(Func<Individual, bool> first)

Notiek ielāde…
Atcelt
Saglabāt