Skip to content

Commit

Permalink
Merge branch 'docs/cleanup-4.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
matusmacik committed Apr 22, 2024
2 parents 2194579 + ecd42a5 commit 2938bc7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/misc/reports/configuration/collection-report.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ If sub-reports are used to multiply rows (see below), this object contains the s
If no `path` was specified for the column, it has the same value as `object` variable.

| `report`
| xref:/midpoint/reference/misc/reports/configuration/report-functions.adoc/[Report Script Library]
| xref:/midpoint/reference/misc/reports/configuration/report-functions/[Report Script Library]
provides functions supporting report processing.

| `basic`
Expand Down Expand Up @@ -328,7 +328,7 @@ This is a single object from the collection, e.g. one result from a query.
If sub-reports are used to multiply rows (see below), this object contains the same object for all such rows.

| `report`
| xref:/midpoint/reference/misc/reports/report-functions/[Report Script Library]
| xref:/midpoint/reference/misc/reports/configuration/report-functions/[Report Script Library]
provides functions supporting report processing.

| `basic`
Expand Down
6 changes: 3 additions & 3 deletions docs/misc/reports/create-report-guide/advanced/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ image::report-collection.png[75%]
image::coll-shadow.png[75%]

In our example we are going to use a custom xref:/midpoint/reference/misc/reports/configuration/collection-report.adoc/#_collection_parameter[parameter] in our filter.
In our example we are going to use a custom xref:/midpoint/reference/misc/reports/configuration/collection-report/#_collection_parameter[parameter] in our filter.

* find the *"Collection"* container
* edit the *"Filter"* attribute (See Warning below) and add the following xml :
Expand Down Expand Up @@ -142,7 +142,7 @@ image::report-param.png[75%]
We need to define a view:
* click on the panel *View* and select type 'Shadow'.

As the next step we add a few new xref:/midpoint/reference/misc/reports/configuration/collection-report.adoc/#_collection_columns[columns] for shadow attributes: name, kind, intent and also one column to demonstrate a custom column.
As the next step we add a few new xref:/midpoint/reference/misc/reports/configuration/collection-report/#_collection_columns[columns] for shadow attributes: name, kind, intent and also one column to demonstrate a custom column.

* add three new columns and fill out the fields, name and path.
* add the first column
Expand Down Expand Up @@ -195,7 +195,7 @@ On the report preview we can see the table with columns and content, which will

image::preview.png[75%]

Next we can add a xref:/midpoint/reference/misc/reports/configuration/collection-report.adoc/#_sub_reports[subreport] field to our report.
Next we can add a xref:/midpoint/reference/misc/reports/configuration/collection-report/#_sub_reports[subreport] field to our report.

* click on the *"Subreport"* panel
Expand Down

0 comments on commit 2938bc7

Please sign in to comment.