Added public JsonExtensions.ToJsonString and ComboboxItemDtoExtensions.ToSelectListItem methods.

Author: hikalkan

src/Abp.Web.Mvc/Abp.Web.Mvc.csproj

@@ -89,6 +89,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Application\Services\Dto\ComboboxItemDtoExtensions.cs" />
     <Compile Include="Web\Mvc\Authorization\AbpMvcAuthorizeAttribute.cs" />
     <Compile Include="Web\Mvc\Controllers\AbpController.cs" />
     <Compile Include="Web\Mvc\Controllers\AbpHandleErrorAttribute.cs" />

src/Abp.Web.Mvc/Application/Services/Dto/ComboboxItemDtoExtensions.cs

@@ -0,0 +1,17 @@
+using System.Web.Mvc;
+
+namespace Abp.Application.Services.Dto
+{
+    public static class ComboboxItemDtoExtensions
+    {
+        public static SelectListItem ToSelectListItem(this ComboboxItemDto comboboxItem)
+        {
+            return new SelectListItem
+            {
+                Value = comboboxItem.Value,
+                Text = comboboxItem.DisplayText,
+                Selected = comboboxItem.IsSelected
+            };
+        }
+    }
+}

src/Abp.Web/Web/Features/FeaturesScriptManager.cs

@@ -67,7 +67,7 @@ public async Task<string> GetScriptAsync()
                 //TODO: Other feature properties and custom attributes
 
                 //TODO: Consider to remove inputType since it's only needed while editing!
-                script.AppendLine("            inputType: " + JsonHelper.ConvertToJson(feature.InputType, true, true));
+                script.AppendLine("            inputType: " + feature.InputType.ToJsonString(true, true));
 
                 script.Append("        }");
 

src/Abp.Web/Web/Navigation/NavigationScriptManager.cs

@@ -58,7 +58,7 @@ private static void AppendMenu(StringBuilder sb, UserMenu menu)
 
             if (menu.CustomData != null)
             {
-                sb.AppendLine("            customData: " + JsonHelper.ConvertToJson(menu.CustomData, true) + ",");
+                sb.AppendLine("            customData: " + menu.CustomData.ToJsonString(true) + ",");
             }
 
             sb.Append("            items: ");
@@ -108,7 +108,7 @@ private static void AppendMenuItem(int indentLength, StringBuilder sb, UserMenuI
 
             if (menuItem.CustomData != null)
             {
-                sb.AppendLine(new string(' ', indentLength + 4) + "customData: " + JsonHelper.ConvertToJson(menuItem.CustomData, true) + ",");
+                sb.AppendLine(new string(' ', indentLength + 4) + "customData: " + menuItem.CustomData.ToJsonString(true) + ",");
             }
 
             sb.Append(new string(' ', indentLength + 4) + "items: [");

src/Abp/Abp.csproj

@@ -154,7 +154,7 @@
     <Compile Include="Runtime\Caching\Configuration\CachingConfiguration.cs" />
     <Compile Include="Runtime\Caching\Configuration\ICacheConfigurator.cs" />
     <Compile Include="Runtime\Caching\Configuration\ICachingConfiguration.cs" />
-    <Compile Include="Json\JsonHelper.cs" />
+    <Compile Include="Json\JsonExtensions.cs" />
     <Compile Include="NameValue.cs" />
     <Compile Include="Application\Services\Dto\NameValueDto.cs" />
     <Compile Include="Application\Services\Dto\NullableIdInput.cs" />

src/Abp/AbpConsts.cs

@@ -8,7 +8,7 @@ public static class AbpConsts
         /// <summary>
         /// Current version of the ABP.
         /// </summary>
-        public const string CurrentVersion = "0.7.1.0";
+        public const string CurrentVersion = "0.7.1.1";
 
         /// <summary>
         /// Localization source name of ASP.NET Boilerplate framework.

src/Abp/Application/Services/Dto/ComboboxItemDto.cs

@@ -18,6 +18,11 @@ public class ComboboxItemDto : IDto
         /// </summary>
         public string DisplayText { get; set; }
 
+        /// <summary>
+        /// Is selected?
+        /// </summary>
+        public bool IsSelected { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="ComboboxItemDto"/>.
         /// </summary>

src/Abp/Auditing/AuditingInterceptor.cs

@@ -140,7 +140,7 @@ private string ConvertArgumentsToJson(IInvocation invocation)
                     dictionary[parameter.Name] = argument;
                 }
 
-                return JsonHelper.ConvertToJson(dictionary, true);
+                return dictionary.ToJsonString(true);
             }
             catch (Exception ex)
             {

src/Abp/Authorization/Permission.cs

@@ -50,7 +50,7 @@ public sealed class Permission
         /// <summary>
         /// Depended feature(s) of this permission.
         /// </summary>
-        public IFeatureDependency DependedFeature { get; }
+        public IFeatureDependency DependedFeature { get; set; }
 
         /// <summary>
         /// List of child permissions. A child permission can be granted only if parent is granted.

src/Abp/Json/JsonHelper.cs renamed to src/Abp/Json/JsonExtensions.cs

@@ -3,9 +3,13 @@
 
 namespace Abp.Json
 {
-    internal static class JsonHelper
+    public static class JsonExtensions
     {
-        public static string ConvertToJson(object obj, bool camelCase = false, bool indented = false)
+        /// <summary>
+        /// Converts given object to JSON string.
+        /// </summary>
+        /// <returns></returns>
+        public static string ToJsonString(this object obj, bool camelCase = false, bool indented = false)
         {
             var options = new JsonSerializerSettings();