Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed May 29, 2014
2 parents 949b88d + 429ae10 commit 8c90b7f
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 3 deletions.
5 changes: 3 additions & 2 deletions ...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
View file
Expand Up @@ -242,8 +242,9 @@ public void notifyChange(ResourceObjectShadowChangeDescription change, Task task
Collection modifications = SynchronizationSituationUtil
.createSynchronizationSituationAndDescriptionDelta(object,
situation.getSituation(), task.getChannel(), false);
modifications.add(PropertyDelta.createModificationReplaceProperty(ShadowType.F_INTENT, object.getDefinition(), synchronizationPolicy.getIntent()));

if (StringUtils.isNotBlank(synchronizationPolicy.getIntent())){
modifications.add(PropertyDelta.createModificationReplaceProperty(ShadowType.F_INTENT, object.getDefinition(), synchronizationPolicy.getIntent()));
}
repositoryService.modifyObject(ShadowType.class, object.getOid(), modifications, subResult);
subResult.recordSuccess();
return;
Expand Down
2 changes: 1 addition & 1 deletion ...l/src/main/resources/com/evolveum/midpoint/task/quartzimpl/execution/tables_sqlServer.sql
View file
Expand Up @@ -80,7 +80,7 @@ DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS];
-- GO

IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPROP_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS];
DROP TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS];
-- GO

IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
Expand Down
54 changes: 54 additions & 0 deletions samples/tasks/bulk-actions/assign-enduser-role-to-selected-users.xml
View file
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2014 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">

<task>
<name>Assign Enduser role to users starting with 'a'</name>
<extension>
<scext:executeScript xmlns:scext="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3">
<s:search xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3">
<s:type>c:UserType</s:type>
<s:searchFilter>
<q:substring>
<q:matching>polyStringNorm</q:matching>
<q:path>c:name</q:path>
<q:value>a</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</s:searchFilter>
<s:action>
<s:type>assign</s:type>
<s:parameter>
<s:name>role</s:name>
<s:constant>00000000-0000-0000-0000-000000000008</s:constant>
</s:parameter>
</s:action>
</s:search>
</scext:executeScript>
</extension>
<ownerRef oid="00000000-0000-0000-0000-000000000002"/>
<executionStatus>runnable</executionStatus>

<category>BulkActions</category>
<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/scripting/handler-3</handlerUri>
<recurrence>single</recurrence>
</task>

</objects>
54 changes: 54 additions & 0 deletions samples/tasks/bulk-actions/assign-resource-to-selected-users.xml
View file
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2014 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">

<task>
<name>Assign OpenDJ account to users starting with 'a'</name>
<extension>
<scext:executeScript xmlns:scext="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3">
<s:search xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3">
<s:type>c:UserType</s:type>
<s:searchFilter>
<q:substring>
<q:matching>polyStringNorm</q:matching>
<q:path>c:name</q:path>
<q:value>a</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</s:searchFilter>
<s:action>
<s:type>assign</s:type>
<s:parameter>
<s:name>resource</s:name>
<s:constant>ef2bc95b-76e0-48e2-86d6-3d4f02d3e1a2</s:constant>
</s:parameter>
</s:action>
</s:search>
</scext:executeScript>
</extension>
<ownerRef oid="00000000-0000-0000-0000-000000000002"/>
<executionStatus>runnable</executionStatus>

<category>BulkActions</category>
<handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/scripting/handler-3</handlerUri>
<recurrence>single</recurrence>
</task>

</objects>

0 comments on commit 8c90b7f

Please sign in to comment.