Add back button for import, remove edit for duplicate

2014-02-05 18:29:15 -05:00
parent 042d3dd476
commit 0a492156a5
4 changed files with 9 additions and 4 deletions
@@ -1,4 +1,5 @@
 function importLogs(userFullName) {
+	$('.breadcrumb').hide();
 	$('.import-status').html('<span class="label">Pending</span');
 	var total = $("#logs > tbody > tr:not(.complete)").length;
 	$('#page-import-status').html('<span class="label label-warning"><i class="fa fa-spinner fa-spin"></i> Import In Progress</span> <strong>Keep page open until complete.</strong>');
@@ -29,18 +30,18 @@
 					$row.addClass("complete");
 					if (result.Status == "Success") {
 						$('.import-status', $row).html('<span class="label label-success">Success</span');
-						$('.import-status', $row).append(" " + result.Action);
 					}
 					else if (result.Status == "Failure") {
 						$('.import-status', $row).html('<span class="label label-important">Failure</span');
 						$('.import-message', $row).text(result.Message);
-						$('.import-status', $row).append(" " + result.Action);
 						errorCount++;
 						$('.progress .bar').addClass('bar-warning');
 					}
 					else if (result.Status == "Duplicate") {
 						$('.import-status', $row).html('<span class="label label-inverse">Duplicate</span');
 						$('.import-message', $row).text(result.Message);
+					}
+					if (result.Action != undefined && result.Action != null) {
 						$('.import-status', $row).append(" " + result.Action);
 					}
 					
@@ -48,6 +49,7 @@
 				}
 			});
 		} else {
+			$('.breadcrumb').show();
 			$('.progress').removeClass('progress-striped');
 			$('.progress').removeClass('active');
 			if (errorCount == 0) {