Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jun 15, 2016 · 4cd17c2 · 4cd17c2
2 parents 8fd0801 + 6312242
commit 4cd17c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java b/.../src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
@@ -106,7 +106,7 @@ public TaskRunResult run(Task task) {
             }
 
             if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace("Context to be executed = " + context.debugDump());
+                LOGGER.trace("Context to be executed = {}", context.debugDump());
             }
 
             try {
@@ -124,6 +124,9 @@ public TaskRunResult run(Task task) {
                     }
                     projectionIterator.remove();
                 }
+				if (task.getChannel() == null) {
+					task.setChannel(context.getChannel());
+				}
                 clockwork.run(context, task, result);
 
 				task.setModelOperationContext(context.toLensContextType());

diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/RepositoryDataItem.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/RepositoryDataItem.java
@@ -18,7 +18,7 @@ public class RepositoryDataItem extends DataItem {
 
 	private static final String COLOR_USER = "darkred";
 	private static final String COLOR_ROLE = "darkgreen";
-	private static final String COLOR_ORG = "darkgreen";
+	private static final String COLOR_ORG = "darkorange";
 	private static final String COLOR_DEFAULT = "black";
 	private static final String COLOR_FILL = "grey92";