Skip to content

Commit

Permalink
assignment focus type fix
Browse files Browse the repository at this point in the history
# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
  • Loading branch information
KaterynaHonchar committed Mar 16, 2018
1 parent 2f65451 commit b96f231
Showing 1 changed file with 11 additions and 0 deletions.
Expand Up @@ -26,6 +26,7 @@
import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.web.component.input.*;
import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
import org.apache.commons.lang.ClassUtils;
Expand All @@ -48,6 +49,7 @@
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;

import com.evolveum.midpoint.gui.api.component.autocomplete.AutoCompleteTextPanel;
Expand Down Expand Up @@ -441,6 +443,15 @@ private Panel createTypedInputComponent(String id) {
return new LockoutStatusPanel(id, getModel().getObject(),
new PropertyModel<>(getModel(), baseExpression));
}
if (AssignmentType.F_FOCUS_TYPE.equals(definition.getName())){
List<QName> typesList = WebComponentUtil.createAbstractRoleTypeList();
typesList.remove(AbstractRoleType.COMPLEX_TYPE);
DropDownChoicePanel<QName> typePanel = new DropDownChoicePanel<QName>(id, new PropertyModel(getModel(), baseExpression),
Model.ofList(typesList), new QNameObjectTypeChoiceRenderer());
typePanel.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
typePanel.setOutputMarkupId(true);
return typePanel;
}
if (ExpressionType.COMPLEX_TYPE.equals(valueType)) {
//it is expected that ExpressionType property is in the
// construction/association/outbound container
Expand Down

0 comments on commit b96f231

Please sign in to comment.