Fixes #1544 - server error in certain refresh scenarios on the edit p…

…ackage page.
NuGet · Sep 3, 2013 · 53003d6 · 53003d6
1 parent 1dfbebc
commit 53003d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -583,7 +583,6 @@ public virtual ActionResult Edit(string id, string version)
             };
 
             var pendingMetadata = _editPackageService.GetPendingMetadata(package);
-            model.HasPendingMetadata = pendingMetadata != null;
             model.Edit = new EditPackageVersionRequest(package, pendingMetadata);
             return View(model);
         }
@@ -607,7 +606,16 @@ public virtual ActionResult Edit(string id, string version, EditPackageRequest f
 
             if (!ModelState.IsValid)
             {
-                return View();
+                formData.PackageId = package.PackageRegistration.Id;
+                formData.PackageTitle = package.Title;
+                formData.Version = package.Version;
+
+                var packageRegistration = _packageService.FindPackageRegistrationById(id);
+                formData.PackageVersions = packageRegistration.Packages
+                        .OrderByDescending(p => new SemanticVersion(p.Version), Comparer<SemanticVersion>.Create((a, b) => a.CompareTo(b)))
+                        .ToList();
+
+                return View(formData);
             }
 
             // Add the edit request to a queue where it will be processed in the background.

diff --git a/src/NuGetGallery/RequestModels/EditPackageRequest.cs b/src/NuGetGallery/RequestModels/EditPackageRequest.cs
@@ -11,7 +11,5 @@ public class EditPackageRequest
         public string Version { get; set; }
 
         public IList<Package> PackageVersions { get; set; }
-
-        public bool HasPendingMetadata { get; set; }
     }
 }