Skip to content

Commit cac9cc3

Browse files
author
Scott Bommarito
authored
Use separate model binding classes (#6993)
1 parent e7a623b commit cac9cc3

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/NuGetGallery/Controllers/PackagesController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ public virtual ActionResult ContactOwners(string id, string version)
13871387
PackageId = id,
13881388
PackageVersion = package.Version,
13891389
ProjectUrl = package.ProjectUrl,
1390-
Owners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed),
1390+
Owners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed).Select(u => u.Username),
13911391
CopySender = true,
13921392
HasOwners = hasOwners
13931393
};
@@ -2141,7 +2141,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
21412141
}
21422142
}
21432143

2144-
public virtual async Task<JsonResult> VerifySymbolsPackageInternal(
2144+
protected virtual async Task<JsonResult> VerifySymbolsPackageInternal(
21452145
VerifyPackageRequest formData,
21462146
Stream uploadFile,
21472147
PackageArchiveReader packageArchiveReader,
@@ -2241,7 +2241,7 @@ await _auditingService.SaveAuditRecordAsync(
22412241
}
22422242
}
22432243

2244-
public virtual async Task<JsonResult> VerifyPackageInternal(
2244+
protected virtual async Task<JsonResult> VerifyPackageInternal(
22452245
VerifyPackageRequest formData,
22462246
Stream uploadFile,
22472247
PackageArchiveReader packageArchiveReader,

src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ContactOwnersViewModel
1717

1818
public string ProjectUrl { get; set; }
1919

20-
public IEnumerable<User> Owners { get; set; }
20+
public IEnumerable<string> Owners { get; set; }
2121

2222
[Display(Name = "Send me a copy")]
2323
public bool CopySender { get; set; }

src/NuGetGallery/Views/Packages/ContactOwners.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<p>
3333
@foreach (var owner in Model.Owners)
3434
{
35-
<a href="@Url.User(owner)" title="View @owner.Username's profile" class="ms-font-xl">@owner.Username</a>
35+
<a href="@Url.User(owner)" title="View @owner's profile" class="ms-font-xl">@owner</a>
3636
}
3737
</p>
3838
</div>

tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2161,7 +2161,7 @@ public void OnlyShowsOwnersWhoAllowReceivingEmails()
21612161

21622162
// assert
21632163
Assert.Equal(2, model.Owners.Count());
2164-
Assert.Empty(model.Owners.Where(u => u.Username == notAllowedUser));
2164+
Assert.Empty(model.Owners.Where(u => u == notAllowedUser));
21652165
}
21662166

21672167
[Fact]

0 commit comments

Comments
 (0)