From 8d109784d72fdf4a2cc0d9f845389a9b05059aac Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Tue, 28 Mar 2023 17:47:02 +0300
Subject: [PATCH] Update required symbol rule

---
 .../TagHelpers/Form/AbpInputTagHelperService.cs               | 4 +++-
 .../TagHelpers/Form/AbpSelectTagHelperService.cs              | 4 +++-
 .../Form/DatePicker/AbpDatePickerBaseTagHelperService.cs      | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
index 0a3d1e1c08..a3cecfa471 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs
@@ -294,8 +294,10 @@ public class AbpInputTagHelperService : AbpTagHelperService<AbpInputTagHelper>
         {
             return "";
         }
+        
+        var isHaveRequiredAttribute = context.AllAttributes.Any(a => a.Name == "required");
 
-        return TagHelper.AspFor.ModelExplorer.GetAttribute<RequiredAttribute>() != null ? "<span> * </span>" : "";
+        return TagHelper.AspFor.ModelExplorer.GetAttribute<RequiredAttribute>() != null || isHaveRequiredAttribute ? "<span> * </span>" : "";
     }
 
     protected virtual string GetInfoAsHtml(TagHelperContext context, TagHelperOutput output, TagHelperOutput inputTag, bool isCheckbox)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
index 78ef04d1d5..eefb6606ef 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs
@@ -196,8 +196,10 @@ public class AbpSelectTagHelperService : AbpTagHelperService<AbpSelectTagHelper>
         {
             return "";
         }
+        
+        var isHaveRequiredAttribute = context.AllAttributes.Any(a => a.Name == "required");
 
-        return TagHelper.AspFor.ModelExplorer.GetAttribute<RequiredAttribute>() != null ? "<span> * </span>" : "";
+        return TagHelper.AspFor.ModelExplorer.GetAttribute<RequiredAttribute>() != null || isHaveRequiredAttribute ? "<span> * </span>" : "";
     }
 
     protected virtual void AddInfoTextId(TagHelperOutput inputTagHelperOutput)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
index 2a373b0cf9..e5fc38ce04 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
@@ -535,8 +535,10 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
         {
             return "";
         }
+        
+        var isHaveRequiredAttribute = context.AllAttributes.Any(a => a.Name == "required");
 
-        return GetAttribute<RequiredAttribute>() != null ? "<span> * </span>" : "";
+        return GetAttribute<RequiredAttribute>() != null || isHaveRequiredAttribute ? "<span> * </span>" : "";
     }
 
     protected abstract ModelExpression GetModelExpression();