Browse Source

Merge branch 'rel-6.0' into gterdem/openiddict_module_docs_update

pull/13781/head
Galip Tolga Erdem 4 years ago
parent
commit
e12524d038
  1. 20
      docs/en/UI/Angular/Current-User.md
  2. 4
      docs/en/docs-nav.json
  3. 7
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

20
docs/en/UI/Angular/Current-User.md

@ -0,0 +1,20 @@
# Angular UI: Current User
The current user information stored in Config State.
### How to Get a Current User Information Configuration
You can use the `getOne` or `getOne$` method of `ConfigStateService` to get a specific configuration property. For that, the property name should be passed to the method as parameter.
```js
// this.config is an instance of ConfigStateService
const currentUser = this.config.getOne("currentUser");
// or
this.config.getOne$("currentUser").subscribe(currentUser => {
// use currentUser here
})
```
> See the [ConfigStateService](./Config-State-Service) for more information.

4
docs/en/docs-nav.json

@ -981,6 +981,10 @@
"text": "Authorization",
"path": "UI/Angular/Authorization.md"
},
{
"text": "Current User",
"path": "UI/Angular/Current-User.md"
},
{
"text": "HTTP Requests",
"path": "UI/Angular/HTTP-Requests.md"

7
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

@ -113,8 +113,11 @@ public class BundlingService : IBundlingService, ITransientDependency
var contributor = CreateContributorInstance(bundleDefinition.BundleContributorType);
contributor.AddScripts(scriptContext);
}
scriptContext.BundleDefinitions.AddIfNotContains(
x => x.Source == "_framework/blazor.webassembly.js",
() => new BundleDefinition { Source = "_framework/blazor.webassembly.js" });
scriptContext.Add("_framework/blazor.webassembly.js");
return scriptContext;
}
@ -206,7 +209,7 @@ public class BundlingService : IBundlingService, ITransientDependency
builder.Append($" <script src=\"{script.Source}\"");
foreach (var additionalProperty in script.AdditionalProperties)
{
builder.Append($"{additionalProperty.Key}={additionalProperty.Value} ");
builder.Append($" {additionalProperty.Key}={additionalProperty.Value} ");
}
builder.AppendLine("></script>");

Loading…
Cancel
Save