Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Mar 24, 2022
2 parents 06cf1b6 + 83d20b5 commit 79c6865
Show file tree
Hide file tree
Showing 26 changed files with 88 additions and 829 deletions.
29 changes: 3 additions & 26 deletions gui/admin-gui/src/main/resources/initial-objects/501-archetype-task-reconciliation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
String description = midpoint.describeResourceObjectSet(task?.activity?.work?.reconciliation?.resourceObjects)
if(StringUtils.isNotEmpty(description)) {
return name + ': ' + description
}

return name
Expand All @@ -135,29 +135,6 @@
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
37 changes: 1 addition & 36 deletions gui/admin-gui/src/main/resources/initial-objects/502-archetype-task-recomputation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,49 +112,14 @@
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType
import org.apache.commons.lang3.StringUtils

def task = focus as TaskType

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
}

return name
return source.name
</code>
</script>
</expression>
<target>
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
29 changes: 3 additions & 26 deletions gui/admin-gui/src/main/resources/initial-objects/503-archetype-task-import.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
String description = midpoint.describeResourceObjectSet(task?.activity?.work?.getImport()?.resourceObjects)
if(StringUtils.isNotEmpty(description)) {
return name + ': ' + description
}

return name
Expand All @@ -135,29 +135,6 @@
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
29 changes: 3 additions & 26 deletions gui/admin-gui/src/main/resources/initial-objects/504-archetype-task-live-sync.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
String description = midpoint.describeResourceObjectSet(task?.activity?.work?.liveSynchronization?.resourceObjects)
if(StringUtils.isNotEmpty(description)) {
return name + ': ' + description
}

return name
Expand All @@ -151,29 +151,6 @@
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
29 changes: 3 additions & 26 deletions gui/admin-gui/src/main/resources/initial-objects/505-archetype-task-async-update.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
String description = midpoint.describeResourceObjectSet(task?.activity?.work?.asynchronousUpdate?.resourceObjects)
if(StringUtils.isNotEmpty(description)) {
return name + ': ' + description
}

return name
Expand All @@ -94,29 +94,6 @@
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
37 changes: 1 addition & 36 deletions gui/admin-gui/src/main/resources/initial-objects/506-archetype-task-cleanup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,49 +71,14 @@
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType
import org.apache.commons.lang3.StringUtils

def task = focus as TaskType

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
}

return name
return source.name
</code>
</script>
</expression>
<target>
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
37 changes: 1 addition & 36 deletions gui/admin-gui/src/main/resources/initial-objects/508-archetype-task-single-bulk-action.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,49 +71,14 @@
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType
import org.apache.commons.lang3.StringUtils

def task = focus as TaskType

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
}

return name
return source.name
</code>
</script>
</expression>
<target>
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down
37 changes: 1 addition & 36 deletions ...admin-gui/src/main/resources/initial-objects/509-archetype-task-iterative-bulk-action.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,49 +113,14 @@
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType
import org.apache.commons.lang3.StringUtils

def task = focus as TaskType

String name = source.name

String resourceName = task?.objectRef?.targetName
if(StringUtils.isNotEmpty(resourceName)) {
return name + ': ' + resourceName
}

return name
return source.name
</code>
</script>
</expression>
<target>
<path>name</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
<script>
<code>
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType

FocusType focus = midpoint.principal.focus

ObjectReferenceType ownerRef = new ObjectReferenceType()
.setOid(midpoint.principalOid)
.setType(focus.asPrismObject().getDefinition().getTypeName())
.setTargetName(focus.getName());

return ownerRef
</code>
</script>
</expression>
<target>
<path>ownerRef</path>
</target>
</mapping>
<mapping>
<strength>weak</strength>
<expression>
Expand Down

0 comments on commit 79c6865

Please sign in to comment.