Merge pull request #15509 from abpframework/auto-merge/rel-7-0/1683

Merge branch dev with rel-7.0

docs/en/Getting-Started-Running-Solution.md

@@ -113,11 +113,11 @@ This is the HTTP API that is used by the web application.
 
 3. Lastly, ensure that the {{if UI=="MVC"}}`.Web`{{else}}`.Blazor`{{end}} project is the startup project and run the application which will open a **welcome** page in your browser
 
-![mvc-tiered-app-home](images/bookstore-home.png)
+![mvc-tiered-app-home](images/bookstore-home-2.png)
 
 Click to the **login** button which will redirect you to the *authentication server* to login to the application:
 
-![bookstore-login](images/bookstore-login.png)
+![bookstore-login](images/bookstore-login-2.png)
 
 {{ else # Tiered != "Yes" }}
 
@@ -125,7 +125,7 @@ Ensure that the {{if UI=="MVC"}}`.Web`{{else}}`.Blazor`{{end}} project is the st
 
 > Use Ctrl+F5 in Visual Studio (instead of F5) to run the application without debugging. If you don't have a debug purpose, this will be faster.
 
-![bookstore-login](images/bookstore-login.png)
+![bookstore-login](images/bookstore-login-2.png)
 
 {{ end # Tiered }}
 
@@ -171,7 +171,7 @@ Ensure that the `.Blazor` project is the startup project and run the application
 
 Once the application starts, click to the **Login** link on to header, which redirects you to the authentication server to enter a username and password:
 
-![bookstore-login](images/bookstore-login.png)
+![bookstore-login](images/bookstore-login-2.png)
 
 {{ else if UI == "NG" }}
 
@@ -191,7 +191,7 @@ yarn start
 
 It may take a longer time for the first build. Once it finishes, it opens the Angular UI in your default browser with the [localhost:4200](http://localhost:4200/) address.
 
-![bookstore-login](images/bookstore-login.png)
+![bookstore-login](images/bookstore-login-2.png)
 
 {{ end }}
 

docs/en/Tutorials/Part-10.md

@@ -1126,6 +1126,21 @@ protected override async Task OnInitializedAsync()
 
 * It is essential to call the `base.OnInitializedAsync()` since `AbpCrudPageBase` has some initialization code to be executed.
 
+Override the `OpenCreateModalAsync` method and adding the following code:
+
+````csharp
+protected override async Task OpenCreateModalAsync()
+{
+    if (!authorList.Any())
+    {
+        throw new UserFriendlyException(message: L["AnAuthorIsRequiredForCreatingBook"]);
+    }
+        
+    await base.OpenCreateModalAsync();
+    NewEntity.AuthorId = authorList.First().Id;
+}
+````
+
 The final `@code` block should be the following:
 
 ````csharp
@@ -1147,6 +1162,17 @@ The final `@code` block should be the following:
         await base.OnInitializedAsync();
         authorList = (await AppService.GetAuthorLookupAsync()).Items;
     }
+
+    protected override async Task OpenCreateModalAsync()
+    {
+        if (!authorList.Any())
+        {
+            throw new UserFriendlyException(message: L["AnAuthorIsRequiredForCreatingBook"]);
+        }
+        
+        await base.OpenCreateModalAsync();
+        NewEntity.AuthorId = authorList.First().Id;
+    }
 }
 ````
 
@@ -1156,7 +1182,6 @@ Finally, add the following `Field` definition into the `ModalBody` of the *Creat
 <Field>
     <FieldLabel>@L["Author"]</FieldLabel>
     <Select TValue="Guid" @bind-SelectedValue="@NewEntity.AuthorId">
-        <SelectItem TValue="Guid" Value="Guid.Empty">@L["PickAnAuthor"]</SelectItem>
         @foreach (var author in authorList)
         {
             <SelectItem TValue="Guid" Value="@author.Id">
@@ -1170,7 +1195,7 @@ Finally, add the following `Field` definition into the `ModalBody` of the *Creat
 This requires to add a new localization key to the `en.json` file:
 
 ````js
-"PickAnAuthor": "Pick an author"
+"AnAuthorIsRequiredForCreatingBook": "An author is required to create a book"
 ````
 
 You can run the application to see the *Author Selection* while creating a new book:

docs/en/Tutorials/Part-5.md

@@ -374,7 +374,7 @@ Open the `/src/app/book/book.component.html` file and replace the create button
 
 Books table in the book management page has an actions button for each row. The actions button includes *Edit* and *Delete* actions:
 
-![bookstore-edit-delete-actions](images/bookstore-edit-delete-actions.png)
+![bookstore-edit-delete-actions](images/bookstore-edit-delete-actions-2.png)
 
 We should hide an action if the current user has not granted for the related permission.