From b2a17134c43aa5f0a06c3a0fbbb6fa7c2ae6ee3f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 15 Nov 2018 15:48:28 +0300 Subject: [PATCH] Tag helpers: isdisabled and readonly changes --- .../TagHelpers/Form/AbpInputTagHelper.cs | 5 ++++- .../Form/AbpInputTagHelperService.cs | 18 +++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs index 7e574c4b10..de93ff4b1d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelper.cs @@ -11,7 +11,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form public string Label { get; set; } [HtmlAttributeName("disabled")] - public bool IsDisabled { get; set; } + public bool IsDisabled { get; set; } = false; + + [HtmlAttributeName("readonly")] + public bool IsReadonly { get; set; } = false; public bool AutoFocus { get; set; } 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 954619733b..0aa57c206d 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 @@ -139,9 +139,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form protected virtual void AddDisabledAttribute(TagHelperOutput inputTagHelperOutput) { - var disabledAttribute = GetAttribute(TagHelper.AspFor.ModelExplorer); - - if (disabledAttribute != null && !inputTagHelperOutput.Attributes.ContainsName("disabled")) + if (inputTagHelperOutput.Attributes.ContainsName("disabled")) + { + return; + } + else if (TagHelper.IsReadonly || GetAttribute(TagHelper.AspFor.ModelExplorer) != null) { inputTagHelperOutput.Attributes.Add("disabled", ""); } @@ -149,9 +151,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form protected virtual void AddReadOnlyAttribute(TagHelperOutput inputTagHelperOutput) { - var readOnlyAttribute = GetAttribute(TagHelper.AspFor.ModelExplorer); - - if (readOnlyAttribute != null && !inputTagHelperOutput.Attributes.ContainsName("readonly")) + if (inputTagHelperOutput.Attributes.ContainsName("readonly")) + { + return; + } + else if (TagHelper.IsReadonly || GetAttribute(TagHelper.AspFor.ModelExplorer) != null) { inputTagHelperOutput.Attributes.Add("readonly", ""); } @@ -246,7 +250,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form foreach (var tagHelperAttribute in tagHelperAttributes) { var nameWithoutPrefix = tagHelperAttribute.Name.Substring(groupPrefix.Length); - var newAttritube = new TagHelperAttribute(nameWithoutPrefix,tagHelperAttribute.Value); + var newAttritube = new TagHelperAttribute(nameWithoutPrefix, tagHelperAttribute.Value); output.Attributes.Add(newAttritube); } }