Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions 14/umbraco-ui-builder/advanced/repositories.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ public class PersonRepository : Repository<Person, int> {
protected override long GetCountImpl(Expression<Func<Person, bool>> whereClause) {
...
}

protected override IEnumerable<TJunctionEntity> GetRelationsByParentIdImpl<TJunctionEntity>(int parentId, string relationAlias)
{
...
}

protected override TJunctionEntity SaveRelationImpl<TJunctionEntity>(TJunctionEntity entity)
{
...
}
}
````

Expand Down
46 changes: 46 additions & 0 deletions 14/umbraco-ui-builder/collections/related-collections.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public class StudentCourse
## Defining a related collection

You can get started with related collection through a two step process:

1. Add collection definition
2. Add related collection entity picker and definition

Expand Down Expand Up @@ -118,3 +119,48 @@ collectionConfig.Editor(editorConfig =>
{% hint style="info" %}
**Relation Config Alias:** The relation config alias must correspond to the related collection picker field alias! (e.g. `studentsCourses`)
{% endhint %}

## Defining repository methods

### **IEnumerable<StudentCourse> GetRelationsByParentIdImpl<StudentCourse>(int parentId, string relationAlias)**

Retrieves the related collections based on the ID of the parent entity.

```csharp
{
var db = _scopeProvider.CreateScope().Database;
var sql = db.SqlContext.Sql()
.Select(new[] { "StudentId", "CourseId" } )
.From("StudentsCourses")
.Where($"studentId = @0", parentId);

var result = db.Fetch<StudentCourse>(sql);

return result;
}
```

### **StudentCourse SaveRelationImpl<StudentCourse>(StudentCourse entity)**

Adds a new related collection to the current parent entity.

```csharp
{
var db = _scopeProvider.CreateScope().Database;

var type = entity.GetType();
var studentId = type.GetProperty("StudentId").GetValue(entity);
var courseId = type.GetProperty("CourseId").GetValue(entity);

// delete relation if exists
db.Execute("DELETE FROM StudentsCourses WHERE StudentId = @0 AND CourseId = @1",
studentId,
courseId);

db.Execute("INSERT INTO StudentsCourses (StudentId, CourseId) VALUES (@0, @1)",
studentId,
courseId);

return entity;
}
```
2 changes: 1 addition & 1 deletion 15/umbraco-cms/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
* [Using Umbraco services](reference/management/using-services/README.md)
* [Content Type Service](reference/management/using-services/contenttypeservice.md)
* [Management API](reference/management-api/README.md)
* [External Access](reference/management-api/external-access.md)
* [External Access](reference/management-api/external-access.md)
* [Cache & Distributed Cache](reference/cache/README.md)
* [Cache Seeding](reference/cache/cache-seeding.md)
* [Examples](reference/cache/examples/README.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ You need to add these configuration values. E.g in a json configuration source l
}
}
```

You can also copy the following JSON directly into your Azure Web App configuration via the Advanced Edit feature.

![image](https://github.com/umbraco/UmbracoDocs/assets/11179749/ae53a26b-c45a-4b71-932a-0682f3d264a8)

```json
Expand All @@ -54,6 +56,8 @@ You can also copy the following JSON directly into your Azure Web App configurat
}
```

Remember to add an `ASPNETCORE_ENVIRONMENT` variable with values `Development`, `Staging`, or `Production`.

The minimum recommended Azure SQL Tier is "S2", however noticeable performance improvements are seen in higher Tiers

If you are load balancing or require the scaling ("scale out") ability of Azure Web Apps then you need to consult the [Load Balancing documentation](load-balancing/). This is due to the fact that a lot more needs to be configured to support scaling/auto-scaling.
Expand Down
8 changes: 8 additions & 0 deletions 15/umbraco-cms/release-candidate-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ Here is a list of all the articles that are new to this version or have been upd
* [Creating a Custom Seed Key Provider](extending/creating-custom-seed-key-provider.md)
* [Cache Settings](reference/configuration/cache-settings.md)
* [Cache Seeding](reference/cache/cache-seeding.md)
* [API Users](fundamentals/data/users/api-users.md)
* [External Access](reference/management-api/external-access.md)

* New UI for the Rich Text Editor: Tiptap
* [Rich Text Editor](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/README.md)
* [Configuration](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/configuration.md)
* [Blocks](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/blocks.md)
* [Change Rich Text Editor UI](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/rich-text-editor/change-rich-text-editor-ui.md)

### Updated articles

Expand Down
4 changes: 3 additions & 1 deletion 15/umbraco-commerce/getting-started/the-licensing-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ Once you have received your license code it needs to be installed on your site.
```json
"Umbraco": {
"Licenses": {
"Umbraco.Commerce": "YOUR_LICENSE_KEY"
"Products": {
"Umbraco.Commerce": "YOUR_LICENSE_KEY"
}
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion 15/umbraco-commerce/key-concepts/webhooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Webhook configuration in Umbraco Commerce.

# Webhooks

Umbraco Commerce makes use of the webhooks feature added in Umbraco v13. See the [Webooks documentation](/umbraco-cms/reference/webhooks) for general webooks configuration.
Umbraco Commerce makes use of the webhooks feature added in Umbraco v13. See the [Webhooks documentation](https://docs.umbraco.com/umbraco-cms/reference/webhooks) for general webooks configuration.

# Events

Expand Down
8 changes: 6 additions & 2 deletions 15/umbraco-deploy/installation/the-licensing-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ For example, in `appsettings.json`:
...
},
"Licenses": {
"Umbraco.Deploy.OnPrem": "<your license key>"
"Products": {
"Umbraco.Deploy.OnPrem": "<your license key>"
}
},
"Deploy": {
...
Expand Down Expand Up @@ -120,7 +122,9 @@ Then configure a random string as an authorization key in configuration. This is
```json
"Umbraco": {
"Licenses": {
"Umbraco.Deploy.OnPrem": "<your license key>"
"Products": {
"Umbraco.Deploy.OnPrem": "<your license key>"
}
},
"LicensesOptions": {
"EnableScheduledValidation": false,
Expand Down
4 changes: 3 additions & 1 deletion 15/umbraco-workflow/installation/licensing.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ Once you have received your license code it needs to be installed on your site.
```json
"Umbraco": {
"Licenses": {
"Umbraco.Workflow": "YOUR_LICENSE_KEY"
"Products": {
"Umbraco.Workflow": "YOUR_LICENSE_KEY"
}
}
}
```
Expand Down
Loading