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
@mederly
mederly committed Oct 21, 2015
2 parents b863b29 + d4c932a commit 7f30f46
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 29 deletions.
15 changes: 15 additions & 0 deletions gui/admin-gui/src/main/webapp/less/midpoint-theme.less
View file
Expand Up @@ -105,6 +105,8 @@ th.cog, td.cog {
vertical-align: middle;
}

// Summary panel (panel above the edit user/role/org forms)

.info-box.summary-panel-user {
border-top: 3px solid #dd4b39;
min-height: 93px;
Expand Down Expand Up @@ -185,4 +187,17 @@ th.cog, td.cog {

.summary-tag-icon {
width: 20px;
}

// form input for binary data upload (used e.g. for photo)

.form-object-value-binary-box {
width: 100%;
padding: 0px;
}

.form-object-value-binary-file-input {
width: 65%;
vertical-align: middle;
display: inline !important;
}
11 changes: 2 additions & 9 deletions gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
View file
Expand Up @@ -247,13 +247,6 @@ div.tree-table-header {
font-weight: bold;
}

.form-object-value-binary-box {
width: 100%;
padding: 0px;
}

.form-object-value-binary-file-input {
width: 80%;
vertical-align: middle;
display: inline !important;
}


17 changes: 15 additions & 2 deletions model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
View file
Expand Up @@ -30,8 +30,8 @@
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.polystring.PrismDefaultPolyStringNormalizer;
import com.evolveum.midpoint.schema.util.ObjectResolver;

import com.evolveum.midpoint.util.logging.LoggingUtils;

import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.mutable.MutableBoolean;

Expand Down Expand Up @@ -1272,7 +1272,20 @@ public static <O extends ObjectType> void setDeltaOldValue(LensElementContext<O>
if (itemDelta.getEstimatedOldValues() != null) {
return;
}
PrismUtil.setDeltaOldValue(ctx.getObjectOld(), itemDelta);
if (ctx.getObjectOld() != null) {
Item<PrismValue, ItemDefinition> itemOld = ctx.getObjectOld().findItem(itemDelta.getPath());
if (itemOld != null) {
itemDelta.setEstimatedOldValues((Collection) PrismValue.cloneCollection(itemOld.getValues()));
} else {
// get the old data from current object. Still better estimate than nothing
if (ctx.getObjectCurrent() != null) {
itemOld = ctx.getObjectCurrent().findItem(itemDelta.getPath());
if (itemOld != null) {
itemDelta.setEstimatedOldValues((Collection) PrismValue.cloneCollection(itemOld.getValues()));
}
}
}
}
}

public static <F extends ObjectType> LensObjectDeltaOperation<F> createObjectDeltaOperation(ObjectDelta<F> focusDelta, OperationResult result,
Expand Down
12 changes: 7 additions & 5 deletions ...del-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
View file
Expand Up @@ -134,8 +134,8 @@ public void initSystem(Task initTask, OperationResult initResult)
throws Exception {
super.initSystem(initTask, initResult);
InternalMonitor.reset();
InternalMonitor.setTraceShadowFetchOperation(true);
InternalMonitor.setTraceResourceSchemaOperations(true);
// InternalMonitor.setTraceShadowFetchOperation(true);
// InternalMonitor.setTraceResourceSchemaOperations(true);
}

@Test
Expand Down Expand Up @@ -2328,10 +2328,12 @@ public void test195ModifyUserJack() throws Exception {
preTestCleanup(AssignmentPolicyEnforcementType.FULL);

// WHEN
TestUtil.displayWhen(TEST_NAME);
modifyUserReplace(USER_JACK_OID, UserType.F_FULL_NAME, task, result,
PrismTestUtil.createPolyString("Magnificent Captain Jack Sparrow"));

// THEN
TestUtil.displayThen(TEST_NAME);
result.computeStatus();
TestUtil.assertSuccess("executeChanges result", result);
// Strong mappings
Expand Down Expand Up @@ -2366,9 +2368,9 @@ public void test195ModifyUserJack() throws Exception {

dummyAuditService.assertOldValue(ChangeType.MODIFY, UserType.class,
UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Jack Sparrow"));
// This is not reconciliation. We are not reading old value.
// dummyAuditService.assertOldValue(ChangeType.MODIFY, ShadowType.class,
// dummyResourceCtl.getAttributeFullnamePath(), "Jack Sparrow");
// We have full account here. It is loaded because of strong mapping.
dummyAuditService.assertOldValue(ChangeType.MODIFY, ShadowType.class,
dummyResourceCtl.getAttributeFullnamePath(), "Cpt. Jack Sparrow");

dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();
Expand Down
24 changes: 11 additions & 13 deletions model/model-intest/src/test/resources/logback-test.xml
View file
Expand Up @@ -43,45 +43,43 @@

<!-- "TRACE" is just too much info, "DEBUG" should be enough for the following talkative components ...
if any of the following is set to "TRACE" then it was changed by mistake and should be changed back -->
<logger name="com.evolveum.midpoint.model.impl.lens.projector" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.Projector" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.Projector" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.FocusProcessor" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.FocusConstraintsChecker" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.FocusPolicyProcessor" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.ProjectionValuesProcessor" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.OutboundProcessor" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.lens" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.ProjectionValuesProcessor" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.projector.OutboundProcessor" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.ChangeExecutor" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.ShadowConstraintsChecker" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.LensUtil" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.lens.LensUtil" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.lens.AssignmentEvaluator" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.expr" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.util" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.sync" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.sync.CorrelationConfirmationEvaluator" level="DEBUG" />
<logger name="com.evolveum.midpoint.provisioning" level="TRACE" />
<logger name="com.evolveum.midpoint.provisioning" level="DEBUG" />
<logger name="com.evolveum.midpoint.provisioning.impl.ResourceManager" level="DEBUG" />
<logger name="com.evolveum.midpoint.expression" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.common.expression" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.common.expression.Expression" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.common.mapping" level="TRACE" />
<logger name="com.evolveum.midpoint.model.common.mapping" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.common.expression.evaluator.AbstractSearchExpressionEvaluator" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.common.expression.evaluator.AssignmentExpressionEvaluator" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.common.expression.evaluator.AssociationExpressionEvaluator" level="DEBUG" />
<logger name="com.evolveum.midpoint.common.monitor" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.controller.SystemConfigurationHandler" level="DEBUG" />
<logger name="com.evolveum.midpoint.notifications" level="DEBUG" />
<logger name="com.evolveum.midpoint.security" level="TRACE" />
<logger name="com.evolveum.midpoint.security" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.sync.FocusValidityScannerTaskHandler" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.util.AbstractSearchIterativeTaskHandler" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.sync.SynchronizationService" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.controller.ModelController" level="TRACE" />
<logger name="com.evolveum.midpoint.model.impl.controller.ModelController" level="DEBUG" />
<logger name="com.evolveum.icf.dummy" level="INFO" />
<logger name="com.evolveum.midpoint.model.impl.expr" level="DEBUG" />
<logger name="com.evolveum.midpoint.model.impl.util.DeleteTaskHandler" level="DEBUG" />

<logger name="com.evolveum.midpoint.security.impl.SecurityEnforcerImpl" level="TRACE" />

<logger name="com.evolveum.midpoint.security.impl.SecurityEnforcerImpl" level="DEBUG" />
<logger name="com.evolveum.midpoint.repo" level="INFO" />

<root level="INFO">
Expand Down

0 comments on commit 7f30f46

Please sign in to comment.