Schedule task type dependent notification messages when starting a task

mgesing · mgesing · commit ecdff5781a3a · 2016-02-12T13:33:48.000+01:00
diff --git a/src/Libraries/SmartStore.Data/Migrations/201601262000441_ImportFramework1.cs b/src/Libraries/SmartStore.Data/Migrations/201601262000441_ImportFramework1.cs
@@ -47,11 +47,11 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
 				"Add import file...",
 				"Importdatei hinzuf�gen...");
 
-			builder.AddOrUpdate("Admin.DataExchange.Import.RunNowNote",
+			builder.AddOrUpdate("Admin.System.ScheduleTasks.RunNow.Success.DataImportTask",
 				"The task is now running in the background. You will receive an email as soon as it is completed. The progress can be tracked in the import profile list.",
 				"Die Aufgabe wird jetzt im Hintergrund ausgef�hrt. Sie erhalten eine E-Mail, sobald sie abgeschlossen ist. Den Fortschritt k�nnen Sie in der Importprofilliste verfolgen.");
 
-			builder.AddOrUpdate("Admin.DataExchange.Export.RunNowNote",
+			builder.AddOrUpdate("Admin.System.ScheduleTasks.RunNow.Success.DataExportTask",
 				"The task is now running in the background. You will receive an email as soon as it is completed. The progress can be tracked in the export profile list.",
 				"Die Aufgabe wird jetzt im Hintergrund ausgef�hrt. Sie erhalten eine E-Mail, sobald sie abgeschlossen ist. Den Fortschritt k�nnen Sie in der Exportprofilliste verfolgen.");
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs
@@ -1014,7 +1014,7 @@ public ActionResult Execute(int id, string selectedIds)
 
 			_taskScheduler.RunSingleTask(profile.SchedulingTaskId, taskParams);
 
-			NotifyInfo(T("Admin.DataExchange.Export.RunNowNote"));
+			NotifyInfo(T("Admin.System.ScheduleTasks.RunNow.Success.DataExportTask"));
 
 			return RedirectToAction("List");
         }
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs
@@ -622,7 +622,7 @@ public ActionResult Execute(int id)
 
 			_taskScheduler.RunSingleTask(profile.SchedulingTaskId, taskParams);
 
-			NotifyInfo(T("Admin.DataExchange.Import.RunNowNote"));
+			NotifyInfo(T("Admin.System.ScheduleTasks.RunNow.Success.DataImportTask"));
 
 			return RedirectToAction("List");
 		}
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs
@@ -16,7 +16,7 @@
 
 namespace SmartStore.Admin.Controllers
 {
-    [AdminAuthorize]
+	[AdminAuthorize]
     public partial class ScheduleTaskController : AdminControllerBase
     {
 		private readonly IScheduleTaskService _scheduleTaskService;
@@ -52,7 +52,30 @@ private bool IsTaskVisible(ScheduleTask task)
 			return false;
 		}
 
-        public ActionResult Index()
+		private string GetTaskMessage(ScheduleTask task, string resourceKey)
+		{
+			string message = null;
+
+			var taskClassName = task.Type
+				.SplitSafe(",")
+				.SafeGet(0)
+				.SplitSafe(".")
+				.LastOrDefault();
+
+			if (taskClassName.HasValue())
+			{
+				message = T(string.Concat(resourceKey, ".", taskClassName));
+			}
+
+			if (message.IsEmpty())
+			{
+				message = T(resourceKey);
+			}
+
+			return message;
+		}
+
+		public ActionResult Index()
         {
             return RedirectToAction("List");
         }
@@ -128,7 +151,7 @@ public ActionResult RunJob(int id, string returnUrl = "")
 			{
 				if (task.IsRunning)
 				{
-					NotifyInfo(T("Admin.System.ScheduleTasks.RunNow.Progress"));
+					NotifyInfo(GetTaskMessage(task, "Admin.System.ScheduleTasks.RunNow.Progress"));
 				}
 				else
 				{
@@ -138,10 +161,9 @@ public ActionResult RunJob(int id, string returnUrl = "")
 					}
 					else
 					{
-						NotifySuccess(T("Admin.System.ScheduleTasks.RunNow.Success"));
+						NotifySuccess(GetTaskMessage(task, "Admin.System.ScheduleTasks.RunNow.Success"));
 					}
 				}
-				var now = DateTime.UtcNow;
 			}
 
 			return Redirect(returnUrl);

Original file line number	Diff line number	Diff line change
`@@ -1014,7 +1014,7 @@ public ActionResult Execute(int id, string selectedIds)`
`1014`	`1014`
`1015`	`1015`	`_taskScheduler.RunSingleTask(profile.SchedulingTaskId, taskParams);`
`1016`	`1016`
`1017`		`- NotifyInfo(T("Admin.DataExchange.Export.RunNowNote"));`
	`1017`	`+ NotifyInfo(T("Admin.System.ScheduleTasks.RunNow.Success.DataExportTask"));`
`1018`	`1018`
`1019`	`1019`	`return RedirectToAction("List");`
`1020`	`1020`	`}`
Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ public ActionResult Execute(int id)`
`622`	`622`
`623`	`623`	`_taskScheduler.RunSingleTask(profile.SchedulingTaskId, taskParams);`
`624`	`624`
`625`		`- NotifyInfo(T("Admin.DataExchange.Import.RunNowNote"));`
	`625`	`+ NotifyInfo(T("Admin.System.ScheduleTasks.RunNow.Success.DataImportTask"));`
`626`	`626`
`627`	`627`	`return RedirectToAction("List");`
`628`	`628`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace SmartStore.Admin.Controllers`
`18`	`18`	`{`
`19`		`- [AdminAuthorize]`
	`19`	`+ [AdminAuthorize]`
`20`	`20`	`public partial class ScheduleTaskController : AdminControllerBase`
`21`	`21`	`{`
`22`	`22`	`private readonly IScheduleTaskService _scheduleTaskService;`
`@@ -52,7 +52,30 @@ private bool IsTaskVisible(ScheduleTask task)`
`52`	`52`	`return false;`
`53`	`53`	`}`
`54`	`54`
`55`		`- public ActionResult Index()`
	`55`	`+ private string GetTaskMessage(ScheduleTask task, string resourceKey)`
	`56`	`+ {`
	`57`	`+ string message = null;`
	`58`	`+`
	`59`	`+ var taskClassName = task.Type`
	`60`	`+ .SplitSafe(",")`
	`61`	`+ .SafeGet(0)`
	`62`	`+ .SplitSafe(".")`
	`63`	`+ .LastOrDefault();`
	`64`	`+`
	`65`	`+ if (taskClassName.HasValue())`
	`66`	`+ {`
	`67`	`+ message = T(string.Concat(resourceKey, ".", taskClassName));`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ if (message.IsEmpty())`
	`71`	`+ {`
	`72`	`+ message = T(resourceKey);`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ return message;`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ public ActionResult Index()`
`56`	`79`	`{`
`57`	`80`	`return RedirectToAction("List");`
`58`	`81`	`}`
`@@ -128,7 +151,7 @@ public ActionResult RunJob(int id, string returnUrl = "")`
`128`	`151`	`{`
`129`	`152`	`if (task.IsRunning)`
`130`	`153`	`{`
`131`		`- NotifyInfo(T("Admin.System.ScheduleTasks.RunNow.Progress"));`
	`154`	`+ NotifyInfo(GetTaskMessage(task, "Admin.System.ScheduleTasks.RunNow.Progress"));`
`132`	`155`	`}`
`133`	`156`	`else`
`134`	`157`	`{`
`@@ -138,10 +161,9 @@ public ActionResult RunJob(int id, string returnUrl = "")`
`138`	`161`	`}`
`139`	`162`	`else`
`140`	`163`	`{`
`141`		`- NotifySuccess(T("Admin.System.ScheduleTasks.RunNow.Success"));`
	`164`	`+ NotifySuccess(GetTaskMessage(task, "Admin.System.ScheduleTasks.RunNow.Success"));`
`142`	`165`	`}`
`143`	`166`	`}`
`144`		`- var now = DateTime.UtcNow;`
`145`	`167`	`}`
`146`	`168`
`147`	`169`	`return Redirect(returnUrl);`