From cc57dae5ca0c19f4e0c24c1f371bdc5f54c311bd Mon Sep 17 00:00:00 2001
From: suhacan <none@none>
Date: Thu, 26 Nov 2009 01:03:48 +0000
Subject: [PATCH] - Minor input validation fix, nothing to see here.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4042271
---
 .../Packages/Orchard.Tags/Controllers/HomeController.cs    | 7 +++++--
 .../Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs    | 5 ++++-
 .../Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs      | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
index e4adee318..fc15c190e 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
@@ -63,8 +63,11 @@ namespace Orchard.Tags.Controllers {
                 else {
                     if (!_authorizer.Authorize(Permissions.CreateTag, T("Couldn't create tag")))
                         return new HttpUnauthorizedResult();
-                    _tagService.CreateTag(newTagName);
-                    _tagService.TagContentItem(taggedContentId, newTagName);
+                    if (!String.IsNullOrEmpty(newTagName)) {
+                        _tagService.CreateTag(newTagName);
+                        _tagService.TagContentItem(taggedContentId, newTagName);
+                    }
+
                 }
                 if (!String.IsNullOrEmpty(returnUrl)) {
                     return Redirect(returnUrl);
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs b/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs
index 4e4c33dc0..b689d361f 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminCreateViewModel.cs
@@ -1,7 +1,10 @@
-using Orchard.Mvc.ViewModels;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Tags.ViewModels {
     public class TagsAdminCreateViewModel : AdminViewModel {
+        [Required, DisplayName("Name:")]
         public string TagName { get; set; }
     }
 }
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs
index 744d202b5..ef13c9d87 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsAdminEditViewModel.cs
@@ -1,8 +1,11 @@
-using Orchard.Mvc.ViewModels;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Orchard.Mvc.ViewModels;
 
 namespace Orchard.Tags.ViewModels {
     public class TagsAdminEditViewModel : AdminViewModel {
         public int Id { get; set; }
+        [Required, DisplayName("Name:")]
         public string TagName { get; set; } 
     }
 }