From 88981b8ca9fb563fca6e45e7e08fd3266ec718ec Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 2 Jan 2019 16:06:45 +0300
Subject: [PATCH] Update AbpRadioInputTagHelperService.cs

---
 .../Form/AbpRadioInputTagHelperService.cs     | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs
index d2e39b2831..3644f322eb 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs
@@ -76,18 +76,19 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             {
                 return TagHelper.AspItems.ToList();
             }
-            else if (TagHelper.AspFor.ModelExplorer.Metadata.IsEnum)
+
+            if (TagHelper.AspFor.ModelExplorer.Metadata.IsEnum)
             {
                 return GetSelectItemsFromEnum(context, output, TagHelper.AspFor.ModelExplorer);
             }
-            else if (TagHelper.AspFor.ModelExplorer.Metadata.IsEnum)
-            {
-                return GetSelectItemsFromAttribute(context, output, TagHelper.AspFor.ModelExplorer);
-            }
-            else
+
+            var selectItemsAttribute = GetAttribute<SelectItems>(TagHelper.AspFor.ModelExplorer);
+            if (selectItemsAttribute != null)
             {
-                throw new Exception("No items provided for select attribute.");
+                return GetSelectItemsFromAttribute(selectItemsAttribute, TagHelper.AspFor.ModelExplorer);
             }
+
+            throw new Exception("No items provided for select attribute.");
         }
 
         protected virtual List<SelectListItem> GetSelectItemsFromEnum(TagHelperContext context, TagHelperOutput output, ModelExplorer explorer)
@@ -118,15 +119,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             return !localizedString.ResourceNotFound ? localizedString.Value : localizer[propertyName].Value;
         }
 
-        protected virtual List<SelectListItem> GetSelectItemsFromAttribute(TagHelperContext context, TagHelperOutput output, ModelExplorer explorer)
+        protected virtual List<SelectListItem> GetSelectItemsFromAttribute(
+            SelectItems selectItemsAttribute,
+            ModelExplorer explorer)
         {
-            var selectItemsAttribute = GetAttribute<SelectItems>(explorer);
-
-            if (selectItemsAttribute == null)
-            {
-                return null;
-            }
-
             var selectItems = selectItemsAttribute.GetItems(explorer)?.ToList();
 
             if (selectItems == null)