Merge branch 'dev' into maliming/net5

docs/en/Settings.md

@@ -2,7 +2,7 @@
 
 [Configuration system](Configuration.md) is a good way to configure the application on startup. In addition to the configurations, ABP provides another way to set and get some application settings.
 
-A setting is a name-value pair stored in a dynamic data source, generally in a database. Setting system is extensible and there are pre-built provides for a user, a tenant, global and default.
+A setting is a name-value pair stored in a dynamic data source, generally in a database. Setting system is extensible and there are pre-built providers for a user, a tenant, global and default.
 
 ## Defining Settings
 
@@ -67,7 +67,7 @@ public class MySettingDefinitionProvider : SettingDefinitionProvider
 
 > Using constants for the setting names is a good practice and ABP packages do it. `Abp.Mailing.Smtp.Host` setting name is a constant defined by the `EmailSettingNames` class (in the `Volo.Abp.Emailing` namespace).
 
-## Reading Setting Values
+## Reading the Setting Values
 
 ### ISettingProvider
 
@@ -108,24 +108,15 @@ public class MyService
 }
 ````
 
-> `ISettingProvider` is a very common service and some base classes (like `IApplicationService`) already property-inject it. You can directly use the `SettingProvider` in such cases.
+> `ISettingProvider` is a very common service and some base classes (like `IApplicationService`) already property-inject it. You can directly use the `SettingProvider` property in such cases.
 
 ### Reading Setting Values on the Client Side
 
-If a setting is allowed to be visible on the client side, current value of the setting can also be read from the JavaScript code. Examples:
+If a setting is allowed to be visible on the client side, current value of the setting can also be read from the client code. See the following documents to understand how to get the setting values in different UI types;
 
-````js
+* [MVC / Razor Pages](UI/AspNetCore/JavaScript-API/Settings.md)
-//Gets a value as string.
+* [Angular](UI/Angular/Settings.md)
-var language = abp.setting.get('Abp.Localization.DefaultLanguage');
+* [Blazor](UI/Blazor/Settings.md)
-
-//Gets an integer value.
-var requiredLength = abp.setting.getInt('Abp.Identity.Password.RequiredLength');
-
-//Gets a boolean value.
-var requireDigit = abp.setting.getBoolean('Abp.Identity.Password.RequireDigit');
-````
-
-In addition, use `abp.setting.values` to get a dictionary of all the setting values.
 
 ## Setting Value Providers
 

docs/en/UI/Angular/Settings.md

@@ -0,0 +1,3 @@
+# Angular UI: Settings
+
+> This document explains how to get setting values in an Angular application. See the [settings document](../../Settings.md) to learn the setting system.

docs/en/UI/AspNetCore/JavaScript-API/Index.md

@@ -16,7 +16,7 @@ ABP provides a set of JavaScript APIs for ASP.NET Core MVC / Razor Pages applica
 * abp.ModalManager
 * [abp.notify](Notify.md)
 * abp.security
-* abp.setting
+* [abp.setting](Settings.md)
 * abp.ui
 * abp.utils
 * abp.ResourceLoader

docs/en/UI/AspNetCore/JavaScript-API/Settings.md

@@ -0,0 +1,33 @@
+# ASP.NET Core MVC / Razor Pages UI: JavaScript Setting API
+
+Localization API allows you to get the values of the settings on the client side. You can read the current value of a setting in the client side only if it is allowed by the setting definition (on the server side).
+
+> This document only explains the JavaScript API. See the [settings document](../../../Settings.md) to understand the ABP setting system.
+
+## Basic Usage
+
+````js
+//Gets a value as string.
+var language = abp.setting.get('Abp.Localization.DefaultLanguage');
+
+//Gets an integer value.
+var requiredLength = abp.setting.getInt('Abp.Identity.Password.RequiredLength');
+
+//Gets a boolean value.
+var requireDigit = abp.setting.getBoolean('Abp.Identity.Password.RequireDigit');
+````
+
+## All Values
+
+`abp.setting.values` can be used to obtain all the setting values as an object where the object properties are setting names and property values are the setting values.
+
+An example value of this object is shown below:
+
+````js
+{
+  Abp.Localization.DefaultLanguage: "en",
+  Abp.Timing.TimeZone: "UTC",
+  ...
+}
+````
+

docs/en/UI/Blazor/Settings.md

@@ -0,0 +1,3 @@
+# Blazor UI: Settings
+
+Blazor applications can reuse the same `ISettingProvider` service that is explained in the [settings document](../../Settings.md).

docs/en/docs-nav.json

@@ -455,6 +455,10 @@
                   "text": "Localization",
                   "path": "UI/AspNetCore/JavaScript-API/Localization.md"
                 },
+                {
+                  "text": "Settings",
+                  "path": "UI/AspNetCore/JavaScript-API/Settings.md"
+                },
                 {
                   "text": "AJAX",
                   "path": "UI/AspNetCore/JavaScript-API/Ajax.md"

docs/zh-Hans/docs-nav.json

@@ -12,7 +12,7 @@
           "path": "Startup-Templates/Console.md"
         },
         {
-          "text": "空Web应用程序t",
+          "text": "空Web应用程序",
           "path": "Getting-Started-AspNetCore-Application.md"
         }
       ]

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs

@@ -260,7 +260,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             var label = new TagBuilder("label");
             label.Attributes.Add("for", GetIdAttributeValue(inputTag));
-            label.InnerHtml.Append(TagHelper.Label);
+            label.InnerHtml.AppendHtml(TagHelper.Label);
 
             if (isCheckbox)
             {

framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs

@@ -69,16 +69,16 @@ namespace Volo.Abp.BlazoriseUI
             return Task.CompletedTask;
         }
 
-        public async Task<bool> ConfirmAsync(string message, string title = null, Action<UiMessageOptions> options = null)
+        public Task<bool> ConfirmAsync(string message, string title = null, Action<UiMessageOptions> options = null)
         {
             var uiMessageOptions = CreateDefaultOptions();
             options?.Invoke(uiMessageOptions);
 
             var callback = new TaskCompletionSource<bool>();
 
-            MessageReceived?.Invoke(this, new UiMessageEventArgs(UiMessageType.Confirmation, message, title, uiMessageOptions));
+            MessageReceived?.Invoke(this, new UiMessageEventArgs(UiMessageType.Confirmation, message, title, uiMessageOptions, callback));
 
-            return await callback.Task;
+            return callback.Task;
         }
 
         protected virtual UiMessageOptions CreateDefaultOptions()

framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs

@@ -35,7 +35,7 @@ namespace Volo.Abp.Settings
             //TODO: How to implement setting.IsInherited?
 
             var value = await GetOrNullValueFromProvidersAsync(providers, setting);
-            if (setting.IsEncrypted)
+            if (value != null && setting.IsEncrypted)
             {
                 value = SettingEncryptionService.Decrypt(setting, value);
             }
@@ -84,4 +84,4 @@ namespace Volo.Abp.Settings
             return null;
         }
     }
-}
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs

@@ -45,24 +45,16 @@ namespace MyCompanyName.MyProjectName.Blazor.Pages
             return UiMessageService.ErrorAsync( "This is the Error message", "Error" );
         }
 
-        Task OnConfirmTestClicked()
+        async Task OnConfirmTestClicked()
         {
-            return UiMessageService.ConfirmAsync( "Are you sure you want to delete the item?", "Confirm", options =>
+            if ( await UiMessageService.ConfirmAsync( "Are you sure you want to delete the item?", "Confirm", options =>
             {
                 options.CancelButtonText = "Do not delete it";
                 options.ConfirmButtonText = "Yes I'm sure";
-            } )
+            } ) )
-                .ContinueWith( result =>
+            {
-                 {
+                Console.WriteLine( "Confirmed" );
-                     if ( result.Result )
+            }
-                     {
-                         Console.WriteLine( "Confirmed" );
-                     }
-                     else
-                     {
-                         Console.WriteLine( "Cancelled" );
-                     }
-                 } );
         }
 
         [Inject] IUiMessageService UiMessageService { get; set; }