Merge branch 'dev'

abpio · Jun 4, 2020 · 9cbed0c · 9cbed0c
2 parents 977131d + 6670aea
commit 9cbed0c
Show file tree

Hide file tree

Showing 6 changed files with 348 additions and 11 deletions.
diff --git a/en/guides/customizing-modules.md b/en/guides/customizing-modules.md
@@ -34,6 +34,12 @@ Data table column extension system allows you to add a new column in the data ta
 * [Data Table Column Extensions for ASP.NET Core UI](../ui/aspnetcore/data-table-column-extensions.md)
 * [Data Table Column Extensions for Angular](../ui/angular/data-table-column-extensions.md)
 
+#### Dynamic Form Extensions
+
+Dynamic form extension system allows you to add a new field in the create and/or edit forms on the user interface. See the related documents to learn how to use this system:
+
+* [Dynamic Form Extensions for Angular](../ui/angular/dynamic-form-extensions.md)
+
 #### Page Toolbar
 
 Page toolbar system allows you to add components to the toolbar of any page. See the related documents to learn how to use this system:

diff --git a/en/images/user-prop-extension-date-of-birth-field-ng.png b/en/images/user-prop-extension-date-of-birth-field-ng.png
diff --git a/en/samples/easy-crm.md b/en/samples/easy-crm.md
@@ -1,26 +1,27 @@
-# Sample: Easy CRM
+# Easy CRM - Sample ABP Project
 
-This is a sample solution developed using the ABP Commercial.
+This is a sample solution developed on top of ABP Commercial.
 
 ![easy-crm-dashboard](../images/easy-crm-dashboard.png)
 
 ## Download
 
-* [Download the source code from here](https://abp.io/api/download/samples/easy-crm) (you need to login to the https://abp.io/ first).
+* You can download the complete source-code from [https://abp.io/api/download/samples/easy-crm](https://abp.io/Account/Login?returnUrl=/api/download/samples/easy-crm)
 
 ## How To Run?
 
-* Open the solution in the **Visual Studio 2019** or later (or with another IDE you like).
+* Open the solution in **Visual Studio 2019** or later (or with another IDE, supports ASP.NET Core).
 * Run the `Volo.EasyCrm.DbMigrator` console application to create the database and seed the initial data.
-* Run the application, login using `admin` as the user name and `1q2w3E*` as the password.
-* Click to the "**Generate and import sample data**" on the home page if you want to generate some random data in order to better investigate the application.
-* Enjoy and investigate the source code!
+* Run the web project.
+* You can login using `admin` as the user name and `1q2w3E*` as the password.
+* To generate random data, click to "**Generate and import sample data**" on the home page.
+* Enjoy and check the source code!
 
 ## Notes
 
-It currently supports;
+This project supports;
 
 * **Entity Framework Core** as the database provider.
 * ASP.NET Core MVC / **Razor Pages** for the user interface.
 
-**Angular UI** version is being developed.
+**Angular UI** version is in development...
diff --git a/en/tutorials/book-store/part-1.md b/en/tutorials/book-store/part-1.md
@@ -791,7 +791,7 @@ yarn ng generate module book --routing true
 Open the `app-routing.module.ts` file in `src\app` folder. Add the new `import` and add a route as shown below
 
 ```js
-import { ApplicationLayoutComponent } from '@abp/ng.theme.basic'; //==> added this line to imports <==
+import { ApplicationLayoutComponent } from '@volo/abp.ng.theme.lepton'; //==> added this line to imports <==
 
 //...added books path with the below to the routes array
 {

diff --git a/en/ui/angular/data-table-column-extensions.md b/en/ui/angular/data-table-column-extensions.md
@@ -142,6 +142,10 @@ export const identityEntityPropContributors: IdentityEntityPropContributors = {
 
 > The `valueResolver` method should return an observable. You can wrap your return values with `of` from RxJS for that.
 
+## Object Extensions
+
+Extra properties defined on an existing entity will be included in the table based on their configuration. The values will also be mapped to and from `extraProperties` automatically. They are available when defining custom contributors, so you can drop, modify, or reorder them. The `isExtra` identifier will be set to `true` for these properties and will define this automatic behavior.
+
 ## API
 
 ### PropData\<R = any\>
@@ -254,7 +258,8 @@ const options: EntityPropOptions<Identity.UserItem> = {
     const selectSensitiveDataVisibility = ConfigState.getSetting(
       'Abp.Identity.IsSensitiveDataVisible'  // hypothetical
     );
-    return store.selectSnapshot(selectSensitiveDataVisibility);
+
+    return store.selectSnapshot(selectSensitiveDataVisibility).toLowerCase() === 'true';
   }
 };