Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/support-4.0' into s…
Browse files Browse the repository at this point in the history 
…upport-4.0
  • Loading branch information
@skublik
skublik committed Jun 11, 2020
2 parents 3a7658f + af520e6 commit bbffba0
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 42 deletions.
8 changes: 1 addition & 7 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
View file
Expand Up @@ -64,13 +64,7 @@ protected String getNullValidDisplayValue() {
return DropDownChoicePanel.this.getNullValidDisplayValue();
}

@Override
public IModel<? extends List<? extends T>> getChoicesModel() {
IModel<? extends List<? extends T>> choices = super.getChoicesModel();
return Model.ofList(WebComponentUtil.sortDropDownChoices(choices, renderer));
}

@Override

public String getModelValue() {
T object = this.getModelObject();
if (object != null) {
Expand Down
66 changes: 40 additions & 26 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java
View file
Expand Up @@ -95,6 +95,10 @@ public class PageCaseWorkItem extends PageAdminCaseWorkItems {
private WorkItemId workItemId;
private PageParameters pageParameters;

public PageCaseWorkItem() {
this((CaseWorkItemType)null);
}

public PageCaseWorkItem(CaseWorkItemType workItem) {
this(workItem, null);
}
Expand All @@ -105,34 +109,43 @@ public PageCaseWorkItem(CaseWorkItemType workItem, PageParameters parameters) {
caseWorkItemModel = new LoadableModel<CaseWorkItemType>(false) {
@Override
protected CaseWorkItemType load() {
return workItem;
if (workItem != null) {
return workItem;
} else {
getSession().error("Workitem model cannot be null");
throw redirectBackViaRestartResponseException();
}
}
};
}

public PageCaseWorkItem(PageParameters parameters) {
this.pageParameters = parameters;

String caseWorkItemId = parameters.get(OnePageParameterEncoder.PARAMETER).toString();
if (StringUtils.isEmpty(caseWorkItemId)) {
throw new IllegalStateException("Work item ID not specified.");
}
try {
workItemId = WorkItemId.create(caseWorkItemId);
} catch (IllegalStateException e) {
getSession().error(getString("PageCaseWorkItem.couldNotGetCase.runtime"));
throw redirectBackViaRestartResponseException();
}

// String caseId = parameters.get(OnePageParameterEncoder.PARAMETER).toString();
// if (StringUtils.isEmpty(caseId)) {
// throw new IllegalStateException("Case ID not specified.");
// }
// workItemId = WorkItemId.create(caseId);
// if (workItemId == null || StringUtils.isEmpty(workItemId.getCaseOid())) {
// throw new IllegalStateException("Case oid not specified.");
// }
//
// caseModel = new LoadableModel<CaseType>(false) {
// @Override
// protected CaseType load() {
// return loadCaseIfNecessary();
// }
// };
//
// caseWorkItemModel = new LoadableModel<CaseWorkItemType>(false) {
// @Override
// protected CaseWorkItemType load() {
// return loadCaseWorkItemIfNecessary();
// }
// };

// initLayout();
caseModel = new LoadableModel<CaseType>(false) {
@Override
protected CaseType load() {
return loadCaseIfNecessary();
}
};

caseWorkItemModel = new LoadableModel<CaseWorkItemType>(false) {
@Override
protected CaseWorkItemType load() {
return loadCaseWorkItemIfNecessary();
}
};
}

@Override
Expand Down Expand Up @@ -194,7 +207,8 @@ private CaseWorkItemType loadCaseWorkItemIfNecessary() {
} catch (NumberFormatException ex) {
LoggingUtils.logUnexpectedException(LOGGER, "Couldn't parse case work item id.", ex);
}
return null;
getSession().error(getString("PageCaseWorkItem.couldNotGetCaseWorkItem"));
throw redirectBackViaRestartResponseException();
}

private void initLayout(){
Expand Down
4 changes: 1 addition & 3 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
View file
Expand Up @@ -460,9 +460,7 @@ private SearchPanel getSearchPanel(){
}

private ObjectFilter getAssignableRolesFilter() {
if (getRoleCatalogStorage().isMultiUserRequest()){
return null;
}
// When multiple users are selected, filter the roles by targeting one of them
Task task = getPageBase().createSimpleTask(OPERATION_LOAD_ASSIGNABLE_ROLES);
OperationResult result = task.getResult();
UserType targetUser = targetUserModel.getObject();
Expand Down
5 changes: 2 additions & 3 deletions ...g/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
View file
Expand Up @@ -15,7 +15,6 @@
import org.springframework.test.context.ContextConfiguration;

import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.xml.ns._public.common.common_3.IterativeTaskInformationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SynchronizationInformationType;

/**
Expand Down Expand Up @@ -49,7 +48,7 @@ protected int getProcessedUsers() {
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws Exception {
SynchronizationInformationType syncInfo = taskAfter.getStoredOperationStats().getSynchronizationInformation();

assertSyncToken(taskAfter, 8, taskAfter.getResult());
assertSyncToken(taskAfter, 8);

assertEquals(syncInfo.getCountUnmatched(), 5);
assertEquals(syncInfo.getCountDeleted(), 0);
Expand Down Expand Up @@ -77,7 +76,7 @@ protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) throws Exception {
SynchronizationInformationType syncInfo = taskAfter.getStoredOperationStats().getSynchronizationInformation();

assertSyncToken(taskAfter, 12, taskAfter.getResult());
assertSyncToken(taskAfter, 12);

assertEquals(syncInfo.getCountUnmatched(), 5);
assertEquals(syncInfo.getCountDeleted(), 0);
Expand Down
5 changes: 2 additions & 3 deletions ...ory/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
View file
Expand Up @@ -15,7 +15,6 @@
import org.springframework.test.context.ContextConfiguration;

import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.xml.ns._public.common.common_3.IterativeTaskInformationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SynchronizationInformationType;

/**
Expand Down Expand Up @@ -49,7 +48,7 @@ protected int getProcessedUsers() {
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws Exception {
SynchronizationInformationType syncInfo = taskAfter.getStoredOperationStats().getSynchronizationInformation();

assertSyncToken(taskAfter, 4, taskAfter.getResult());
assertSyncToken(taskAfter, 4);

assertEquals(syncInfo.getCountUnmatchedAfter(), 0);
assertEquals(syncInfo.getCountDeletedAfter(), 0);
Expand All @@ -72,7 +71,7 @@ protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) throws Exception {
SynchronizationInformationType syncInfo = taskAfter.getStoredOperationStats().getSynchronizationInformation();

assertSyncToken(taskAfter, 4, taskAfter.getResult());
assertSyncToken(taskAfter, 4);

assertEquals(syncInfo.getCountUnmatchedAfter(), 0);
assertEquals(syncInfo.getCountDeletedAfter(), 0);
Expand Down

0 comments on commit bbffba0

Please sign in to comment.