-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/task-part-restructuring
# Conflicts: # gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java # infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java # infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java # infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java # infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java # infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java # infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java # infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd # infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java # infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java # model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportJasperCreateTaskHandler.java # repo/repo-common/pom.xml
- Loading branch information
Showing
1,595 changed files
with
31,406 additions
and
158,699 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2010-2020 Evolveum and contributors | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <report xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" | ||
| xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" | ||
| xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" | ||
| oid="00000000-0000-0000-0000-000000000080"> | ||
| <name>All audit records report</name> | ||
| <description>Report made from all audit records.</description> | ||
| <assignment> | ||
| <targetRef oid="00000000-0000-0000-0000-000000000171" type="ArchetypeType"/> | ||
| </assignment> | ||
| <objectCollection> | ||
| <collection> | ||
| <baseCollectionRef> | ||
| <collectionRef oid="00000000-0000-0000-0001-000000000284" type="ObjectCollectionType"/> | ||
| </baseCollectionRef> | ||
| <filter> | ||
| <q:and> | ||
| <q:ref> | ||
| <q:path>targetRef</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <objectVariableMode>prismReference</objectVariableMode> | ||
| <code> | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; | ||
|
|
||
| if (!target) { | ||
| return null; | ||
| } | ||
|
|
||
| ObjectReferenceType ort = new ObjectReferenceType(); | ||
| ort.setOid(target.getOid()); | ||
| ort.setRelation(target.getRelation()); | ||
| ort.setType(target.getTargetType()); | ||
| return ort; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:ref> | ||
| <q:ref> | ||
| <q:path>initiatorRef</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <objectVariableMode>prismReference</objectVariableMode> | ||
| <code> | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; | ||
|
|
||
| if (!initiator) { | ||
| return null; | ||
| } | ||
|
|
||
| ObjectReferenceType ort = new ObjectReferenceType(); | ||
| ort.setOid(initiator.getOid()); | ||
| ort.setRelation(initiator.getRelation()); | ||
| ort.setType(initiator.getTargetType()); | ||
| return ort; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:ref> | ||
| <q:equal> | ||
| <q:path>outcome</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <code> | ||
| if (!outcome) { | ||
| return null; | ||
| } | ||
| return outcome; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:equal> | ||
| <q:equal> | ||
| <q:path>eventType</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <code> | ||
| if (!eventType) { | ||
| return null; | ||
| } | ||
| return eventType; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:equal> | ||
| <q:equal> | ||
| <q:path>eventStage</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <code> | ||
| if (!eventStage) { | ||
| return null; | ||
| } | ||
| return eventStage; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:equal> | ||
| <q:greater> | ||
| <q:path>timestamp</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <code> | ||
| if (!from) { | ||
| return null; | ||
| } | ||
| return from; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:greater> | ||
| <q:less> | ||
| <q:path>timestamp</q:path> | ||
| <expression> | ||
| <queryInterpretationOfNoValue>filterAll</queryInterpretationOfNoValue> | ||
| <script> | ||
| <code> | ||
| if (!to) { | ||
| return null; | ||
| } | ||
| return to; | ||
| </code> | ||
| </script> | ||
| </expression> | ||
| </q:less> | ||
| </q:and> | ||
| </filter> | ||
| </collection> | ||
| <parameter> | ||
| <name>outcome</name> | ||
| <type>OperationResultStatusType</type> | ||
| <display> | ||
| <label> | ||
| <orig>outcome</orig> | ||
| <translation> | ||
| <key>AuditEventRecordType.outcome</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| <parameter> | ||
| <name>eventType</name> | ||
| <type>AuditEventTypeType</type> | ||
| <display> | ||
| <label> | ||
| <orig>eventType</orig> | ||
| <translation> | ||
| <key>AuditEventRecordType.eventType</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| <parameter> | ||
| <name>eventStage</name> | ||
| <type>AuditEventStageType</type> | ||
| <display> | ||
| <label> | ||
| <orig>eventStage</orig> | ||
| <translation> | ||
| <key>AuditEventRecordType.eventStage</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| <parameter> | ||
| <name>from</name> | ||
| <type>dateTime</type> | ||
| <display> | ||
| <label> | ||
| <orig>from</orig> | ||
| <translation> | ||
| <key>AuditPopupPanel.dateFrom</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| <parameter> | ||
| <name>to</name> | ||
| <type>dateTime</type> | ||
| <display> | ||
| <label> | ||
| <orig>to</orig> | ||
| <translation> | ||
| <key>AuditPopupPanel.dateTo</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| <parameter> | ||
| <name>target</name> | ||
| <type>c:ObjectReferenceType</type> | ||
| <display> | ||
| <label> | ||
| <orig>targetRef</orig> | ||
| <translation> | ||
| <key>AuditEventRecordType.targetRef</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| <parameter> | ||
| <name>initiator</name> | ||
| <type>c:ObjectReferenceType</type> | ||
| <display> | ||
| <label> | ||
| <orig>initiatorRef</orig> | ||
| <translation> | ||
| <key>AuditEventRecordType.initiatorRef</key> | ||
| </translation> | ||
| </label> | ||
| </display> | ||
| </parameter> | ||
| </objectCollection> | ||
| </report> |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
189 changes: 175 additions & 14 deletions
189
config/initial-objects/140-report-certification-campaigns.xml
Large diffs are not rendered by default.
Oops, something went wrong.
206 changes: 192 additions & 14 deletions
206
config/initial-objects/150-report-certification-cases.xml
Large diffs are not rendered by default.
Oops, something went wrong.
191 changes: 177 additions & 14 deletions
191
config/initial-objects/160-report-certification-decisions.xml
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.