From 0a492156a547f14773d90431ad8c5e2653710717 Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Wed, 5 Feb 2014 18:29:15 -0500 Subject: [PATCH] Add back button for import, remove edit for duplicate --- Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs | 1 - Web/Controllers/CreateLogController.cs | 2 +- Web/Scripts/Shared/ImportCreate.js | 6 ++++-- Web/Views/CreateLog/Import.cshtml | 4 ++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs b/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs index 2df9f40..d36f839 100644 --- a/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs +++ b/Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs @@ -1,7 +1,6 @@ using System; using AutoMapper; using MileageTraker.Web.ViewModels; -using MileageTraker.Web.ViewModels.CreateLog; using NUnit.Framework; namespace Web.Tests.ViewModels.CreateLog diff --git a/Web/Controllers/CreateLogController.cs b/Web/Controllers/CreateLogController.cs index 7da31b8..1a3695a 100644 --- a/Web/Controllers/CreateLogController.cs +++ b/Web/Controllers/CreateLogController.cs @@ -257,7 +257,7 @@ namespace MileageTraker.Web.Controllers { Status = ImportStatus.Duplicate.ToString(), Message = "This log has been previously entered", - Action = link + //Action = link }, JsonRequestBehavior.AllowGet); } // verify vehicle exists diff --git a/Web/Scripts/Shared/ImportCreate.js b/Web/Scripts/Shared/ImportCreate.js index 2eab185..54935e4 100644 --- a/Web/Scripts/Shared/ImportCreate.js +++ b/Web/Scripts/Shared/ImportCreate.js @@ -1,4 +1,5 @@ function importLogs(userFullName) { + $('.breadcrumb').hide(); $('.import-status').html('Pending tbody > tr:not(.complete)").length; $('#page-import-status').html(' Import In Progress Keep page open until complete.'); @@ -29,18 +30,18 @@ $row.addClass("complete"); if (result.Status == "Success") { $('.import-status', $row).html('SuccessFailureDuplicate } + + @Html.Partial("_StatusMessage")

@ViewBag.Title