Added event to topic editing

Michael-Herzog · Michael-Herzog · commit f08440d72cb0 · 2015-03-04T12:07:50.000+01:00
diff --git a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs
@@ -8,7 +8,7 @@
 namespace SmartStore.GoogleAnalytics
 {
     /// <summary>
-    /// Live person provider
+    /// Google Analytics Plugin
     /// </summary>
 	public class GoogleAnalyticPlugin : BasePlugin, IWidget, IConfigurable
     {
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs
@@ -3,11 +3,13 @@
 using System.Web.Mvc;
 using SmartStore.Admin.Models.Topics;
 using SmartStore.Core.Domain.Topics;
+using SmartStore.Core.Events;
 using SmartStore.Services.Localization;
 using SmartStore.Services.Security;
 using SmartStore.Services.Stores;
 using SmartStore.Services.Topics;
 using SmartStore.Web.Framework.Controllers;
+using SmartStore.Web.Framework.Mvc;
 using Telerik.Web.Mvc;
 
 namespace SmartStore.Admin.Controllers
@@ -24,6 +26,7 @@ public class TopicController : AdminControllerBase
         private readonly IPermissionService _permissionService;
 		private readonly IStoreService _storeService;
 		private readonly IStoreMappingService _storeMappingService;
+        private readonly IEventPublisher _eventPublisher;
 
         #endregion Fields
 
@@ -32,7 +35,7 @@ public class TopicController : AdminControllerBase
         public TopicController(ITopicService topicService, ILanguageService languageService,
             ILocalizedEntityService localizedEntityService, ILocalizationService localizationService,
 			IPermissionService permissionService, IStoreService storeService,
-			IStoreMappingService storeMappingService)
+            IStoreMappingService storeMappingService, IEventPublisher eventPublisher)
         {
             this._topicService = topicService;
             this._languageService = languageService;
@@ -41,6 +44,7 @@ public TopicController(ITopicService topicService, ILanguageService languageServ
             this._permissionService = permissionService;
 			this._storeService = storeService;
 			this._storeMappingService = storeMappingService;
+            this._eventPublisher = eventPublisher;
         }
 
         #endregion
@@ -221,7 +225,8 @@ public ActionResult Edit(int id)
         }
 
         [HttpPost, ParameterBasedOnFormNameAttribute("save-continue", "continueEditing")]
-        public ActionResult Edit(TopicModel model, bool continueEditing)
+        [ValidateInput(false)]
+        public ActionResult Edit(TopicModel model, bool continueEditing, FormCollection form)
         {
             if (!_permissionService.Authorize(StandardPermissionProvider.ManageTopics))
                 return AccessDeniedView();
@@ -247,7 +252,9 @@ public ActionResult Edit(TopicModel model, bool continueEditing)
                 
 				//locales
                 UpdateLocales(topic, model);
-                
+
+                _eventPublisher.Publish(new ModelBoundEvent(model, topic, form));
+
                 NotifySuccess(_localizationService.GetResource("Admin.ContentManagement.Topics.Updated"));
                 return continueEditing ? RedirectToAction("Edit", topic.Id) : RedirectToAction("List");
             }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs
@@ -12,7 +12,7 @@
 namespace SmartStore.Admin.Models.Topics
 {
     [Validator(typeof(TopicValidator))]
-    public class TopicModel : EntityModelBase, ILocalizedModel<TopicLocalizedModel>
+    public class TopicModel : TabbableModel, ILocalizedModel<TopicLocalizedModel>
     {
         #region widget zone names
         private readonly static string[] s_widgetZones = new string[] { 
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Picture.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Shared/EditorTemplates/Picture.cshtml
@@ -8,11 +8,11 @@
     var random = CommonHelper.GenerateRandomInteger();
     var clientId = "picture" + random;
     var pictureService = EngineContext.Current.Resolve<SmartStore.Services.Media.IPictureService>();
-    int pictureId = Model.HasValue ? Model.Value : 0; // codehint: sm-add
-	var picture = pictureService.GetPictureById(pictureId); // codehint: sm-edit
+    int pictureId = Model.HasValue ? Model.Value : 0;
+	var picture = pictureService.GetPictureById(pictureId);
 
-	Html.AddScriptParts("~/bundles/fileupload");
-	Html.AddCssFileParts("~/css/fileupload");
+    Html.AddScriptParts("~/bundles/fileupload");
+    Html.AddCssFileParts("~/css/fileupload");
 }
 
 <div id="@clientId" class="fileupload" style="display: inline-block;">

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace SmartStore.GoogleAnalytics`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`		`- /// Live person provider`
	`11`	`+ /// Google Analytics Plugin`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class GoogleAnalyticPlugin : BasePlugin, IWidget, IConfigurable`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace SmartStore.Admin.Models.Topics`
`13`	`13`	`{`
`14`	`14`	`[Validator(typeof(TopicValidator))]`
`15`		`- public class TopicModel : EntityModelBase, ILocalizedModel<TopicLocalizedModel>`
	`15`	`+ public class TopicModel : TabbableModel, ILocalizedModel<TopicLocalizedModel>`
`16`	`16`	`{`
`17`	`17`	`#region widget zone names`
`18`	`18`	`private readonly static string[] s_widgetZones = new string[] {`