Fixes #4 Script Name Must Be Unique

michaelburns · Nov 28, 2015 · 06c8a4d · 06c8a4d
1 parent ce191f4
commit 06c8a4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/LaunchPad/Controllers/PowerShellController.cs b/src/LaunchPad/Controllers/PowerShellController.cs
@@ -37,13 +37,13 @@ public IActionResult Create()
         [HttpPost] //TODO: Need to turn off ValidateInput
         [ValidateAntiForgeryToken]
         public ActionResult Create([Bind("Name,Script")] PowerShellViewModel newScript)
-        {
-            var script = ConvertServices.CreateScript(newScript, User.Identity.Name);
-
+        {
             if (ScriptIO.ScriptExists(newScript.Name)) //TODO: Ensure this works on ViewModel - Having Issues - 11/16/2015
             {
                 ModelState.AddModelError("Name", "This Name Already Exists");
+                return View(newScript);
             }
+            var script = ConvertServices.CreateScript(newScript, User.Identity.Name);           
             if (TryValidateModel(script))
             {
                 //Write File and Save Metadata

diff --git a/src/LaunchPad/Views/PowerShell/Create.cshtml b/src/LaunchPad/Views/PowerShell/Create.cshtml
@@ -19,7 +19,6 @@
             @Html.LabelFor(model => model.Name, htmlAttributes: new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @Html.EditorFor(model => model.Name, new { htmlAttributes = new { @class = "form-control" } })
-                @Html.ValidationMessageFor(model => model.Name, "", new { @class = "text-danger" })
                 <span asp-validation-for="Name"></span>
             </div>
         </div>