Merge remote-tracking branch 'upstream/master'

Author: personball

angular/src/app/tenants/create-tenant/create-tenant.component.html

@@ -1,4 +1,4 @@
-<div bsModal #createTenantModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="createUserModal" aria-hidden="true" [config]="{backdrop: 'static'}">
+<div bsModal #createTenantModal="bs-modal" class="modal fade" (onShown)="onShown()" tabindex="-1" role="dialog" aria-labelledby="createUserModal" aria-hidden="true" [config]="{backdrop: 'static'}">
     <div class="modal-dialog">
 
         <div #modalContent class="modal-content">
@@ -45,7 +45,7 @@ <h4 class="modal-title">
                             <label for="isactive" class="form-label">{{ "IsActive" | localize }}</label>
                         </div>
                     </div>
-                    <p>{{ "DefaultPasswordIs" | localize }} 123qwe</p>
+                    <p>{{ "DefaultPasswordIs" | localize:'123qwe' }}</p>
                 </div>
 
                 <div class="modal-footer">

angular/src/shared/pipes/localize.pipe.ts

@@ -2,15 +2,15 @@ import { Injector, Pipe, PipeTransform } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
 
 @Pipe({
-  name: 'localize'
+    name: 'localize'
 })
 export class LocalizePipe extends AppComponentBase implements PipeTransform {
 
-  constructor(injector: Injector) {
-    super(injector);
-  }
- 
-  transform(key: string): string {
-    return this.l(key);
-  }
+    constructor(injector: Injector) {
+        super(injector);
+    }
+
+    transform(key: string, ...args: any[]): string {
+        return this.l(key, args);
+    }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/web.config

@@ -4,7 +4,9 @@
     <handlers>
       <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" startupTimeLimit="3600" requestTimeout="23:00:00" />
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" startupTimeLimit="3600" requestTimeout="23:00:00">
+      <environmentVariables />
+    </aspNetCore>
     <httpProtocol>
       <customHeaders>
         <remove name="X-Powered-By" />

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/TenantsController.cs

@@ -5,6 +5,7 @@
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
+using AbpCompanyName.AbpProjectName.MultiTenancy.Dto;
 
 namespace AbpCompanyName.AbpProjectName.Web.Controllers
 {
@@ -20,7 +21,7 @@ public TenantsController(ITenantAppService tenantAppService)
 
         public async Task<ActionResult> Index()
         {
-            var output = await _tenantAppService.GetAll(new PagedResultRequestDto { MaxResultCount = int.MaxValue }); // Paging not implemented yet
+            var output = await _tenantAppService.GetAll(new PagedTenantResultRequestDto { MaxResultCount = int.MaxValue }); // Paging not implemented yet
             return View(output);
         }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/web.config

@@ -2,9 +2,11 @@
 <configuration>
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
     </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false">
+      <environmentVariables />
+    </aspNetCore>
     <staticContent>
       <remove fileExtension=".woff" />
       <remove fileExtension=".woff2" />
@@ -17,4 +19,4 @@
       </customHeaders>
     </httpProtocol>
   </system.webServer>
-</configuration>
+</configuration>