cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 08:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #759 from tgstation/757-TestMergeTrackingIssue

Browse Source 
Fixes attempting to attach an already loaded User while test merging
This commit is contained in:
Jordan Brown
2018-10-02 10:52:58 -04:00
committed by GitHub
parent 723a9a5596 0c9dfaabf2
commit 7ce71dbc2b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/RepositoryController.cs
+11 -4
View File
@@ -644,11 +644,18 @@ namespace Tgstation.Server.Host.Controllers
if (needToApplyRemainingPrs)
{
var contextUser = new Models.User
//an invocation of LoadRevisionInformation could have already loaded this user
var contextUser = databaseContext.Users.Local.Where(x => x.Id == AuthenticationContext.User.Id).FirstOrDefault();
if (contextUser == default)
{
Id = AuthenticationContext.User.Id
};
databaseContext.Users.Attach(contextUser);
contextUser = new Models.User
{
Id = AuthenticationContext.User.Id
};
databaseContext.Users.Attach(contextUser);
}
else
Logger.LogTrace("Skipping attaching the user to the database context as it is already loaded!");
foreach (var I in model.NewTestMerges)
{