> rowModel){
+ return Model.of(true);
+ }
}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
index 4bb2a304c6c..f5caba31b0b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
@@ -7,20 +7,7 @@
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
- ~ Unless required by applicable law or agr eed to in writing, software
+ ~ 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
@@ -38,32 +25,50 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
index eba47c48d45..331108d96d2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
@@ -15,10 +15,13 @@
*/
package com.evolveum.midpoint.gui.api.component;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
+import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition;
+import com.evolveum.midpoint.common.refinery.RefinedResourceSchema;
import com.evolveum.midpoint.model.api.ModelInteractionService;
import com.evolveum.midpoint.model.api.RoleSelectionSpecification;
import com.evolveum.midpoint.prism.query.ObjectFilter;
@@ -27,40 +30,36 @@
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.logging.LoggingUtils;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.util.SelectableBean;
+import com.evolveum.midpoint.web.page.admin.orgs.OrgTreeAssignablePanel;
import com.evolveum.midpoint.web.security.SecurityUtils;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.model.util.ListModel;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.assignment.RelationTypes;
import com.evolveum.midpoint.web.component.dialog.Popupable;
import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
-import com.evolveum.midpoint.web.component.input.QNameChoiceRenderer;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
public class TypedAssignablePanel extends BasePanel implements Popupable{
@@ -68,9 +67,17 @@ public class TypedAssignablePanel extends BasePanel imp
private static final String ID_TYPE = "type";
private static final String ID_RELATION = "relation";
+ private static final String ID_KIND = "kind";
+ private static final String ID_INTENT = "intent";
+ private static final String ID_RELATION_CONTAINER = "relationContainer";
+ private static final String ID_KIND_CONTAINER = "kindContainer";
+ private static final String ID_INTENT_CONTAINER = "intentContainer";
private static final String ID_ROLE_TABLE = "roleTable";
private static final String ID_RESOURCE_TABLE = "resourceTable";
private static final String ID_ORG_TABLE = "orgTable";
+ private static final String ID_ORG_TREE_VIEW = "orgTreeView";
+ private static final String ID_ORG_TREE_VIEW_CONTAINER = "orgTreeViewContainer";
+ private static final String ID_ORG_TREE_VIEW_PANEL = "orgTreeViewPanel";
private static final String ID_SELECTED_ROLES = "rolesSelected";
private static final String ID_SELECTED_RESOURCES = "resourcesSelected";
@@ -88,6 +95,10 @@ public class TypedAssignablePanel extends BasePanel imp
private static final String OPERATION_LOAD_ASSIGNABLE_ROLES = DOT_CLASS + "loadAssignableRoles";
protected IModel typeModel;
+ private IModel orgTreeViewModel;
+ private IModel intentValueModel;
+ private LoadableModel> intentValues;
+ String intent;
public TypedAssignablePanel(String id, final Class type) {
super(id);
@@ -104,6 +115,26 @@ protected ObjectTypes load() {
return ObjectTypes.getObjectType(type);
}
};
+ orgTreeViewModel = Model.of(false);
+ intentValues = getIntentAvailableValuesModel();
+ intentValueModel = new IModel() {
+ @Override
+ public String getObject() {
+ return intent != null ? intent :
+ (intentValues.getObject().size() > 0 ?
+ intentValues.getObject().get(0) : "default");
+ }
+
+ @Override
+ public void setObject(String s) {
+ intent = s;
+ }
+
+ @Override
+ public void detach() {
+
+ }
+ };
}
@Override
@@ -124,8 +155,30 @@ protected void onInitialize() {
PopupObjectListPanel listServicePanel = createObjectListPanel(ID_SERVICE_TABLE, ID_SELECTED_SERVICES, ObjectTypes.SERVICE);
tablesContainer.add(listServicePanel);
- WebMarkupContainer countContainer = createCountContainer();
- add(countContainer);
+ OrgTreeAssignablePanel orgTreePanel = new OrgTreeAssignablePanel(
+ ID_ORG_TREE_VIEW_PANEL, true, getPageBase()) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void assignSelectedOrgPerformed(List selectedOrgs, AjaxRequestTarget target) {
+ TypedAssignablePanel.this.assignButtonClicked(target, (List)selectedOrgs);
+ }
+ };
+ orgTreePanel.setOutputMarkupId(true);
+ orgTreePanel.add(new VisibleEnableBehaviour(){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isVisible(){
+ return OrgType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName()) && isOrgTreeViewSelected();
+ }
+ });
+ tablesContainer.add(orgTreePanel);
+
+ //todo now it's usually hiden by object list panel - bad layout; need to discuss: if count panel should be visible
+ //after org tree panel is added
+// WebMarkupContainer countContainer = createCountContainer();
+// add(countContainer);
AjaxButton addButton = new AjaxButton(ID_BUTTON_ASSIGN,
@@ -135,11 +188,7 @@ protected void onInitialize() {
@Override
public void onClick(AjaxRequestTarget target) {
- List selected = getSelectedData(ID_ROLE_TABLE);
- selected.addAll(getSelectedData(ID_RESOURCE_TABLE));
- selected.addAll(getSelectedData(ID_ORG_TABLE));
- selected.addAll(getSelectedData(ID_SERVICE_TABLE));
- TypedAssignablePanel.this.addPerformed(target, selected, getSelectedRelation());
+ TypedAssignablePanel.this.assignButtonClicked(target, new ArrayList<>());
}
};
@@ -147,18 +196,31 @@ public void onClick(AjaxRequestTarget target) {
private static final long serialVersionUID = 1L;
-// @Override
-// public boolean isVisible() {
-// return multiselect;
-// }
+ @Override
+ public boolean isVisible() {
+ return !isOrgTreeViewSelected();
+ }
});
add(addButton);
}
+ private void assignButtonClicked(AjaxRequestTarget target, List selectedOrgs){
+ List selected = getSelectedData(ID_ROLE_TABLE);
+ selected.addAll(getSelectedData(ID_RESOURCE_TABLE));
+ selected.addAll(getSelectedData(ID_SERVICE_TABLE));
+ if (isOrgTreeViewSelected()){
+ selected.addAll(selectedOrgs);
+ } else {
+ selected.addAll(getSelectedData(ID_ORG_TABLE));
+ }
+ addPerformed(target, selected, getSelectedRelation(), getKind(), getIntent());
+ }
+
+
protected void initAssignmentParametersPanel(){
DropDownChoicePanel typeSelect = new DropDownChoicePanel<>(
- ID_TYPE, typeModel, Model.ofList(WebComponentUtil.createAssignableTypesList()), new EnumChoiceRenderer<>());
+ ID_TYPE, typeModel, Model.ofList(getObjectTypesList()), new EnumChoiceRenderer<>());
typeSelect.getBaseFormComponent().add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -173,27 +235,125 @@ protected void onUpdate(AjaxRequestTarget target) {
add(typeSelect);
+ WebMarkupContainer relationContainer = new WebMarkupContainer(ID_RELATION_CONTAINER);
+ relationContainer.add(new VisibleEnableBehaviour(){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isVisible() {
+ return TypedAssignablePanel.this.isRelationPanelVisible() &&
+ !ResourceType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName());
+ }
+
+ });
+ relationContainer.setOutputMarkupId(true);
+ add(relationContainer);
+
DropDownChoicePanel relationSelector = WebComponentUtil.createEnumPanel(RelationTypes.class, ID_RELATION,
WebComponentUtil.createReadonlyModelFromEnum(RelationTypes.class), Model.of(RelationTypes.MEMBER), TypedAssignablePanel.this, false);
relationSelector.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
- relationSelector.add(new VisibleEnableBehaviour(){
+ relationSelector.setOutputMarkupId(true);
+ relationSelector.setOutputMarkupPlaceholderTag(true);
+ relationContainer.add(relationSelector);
+
+ WebMarkupContainer kindContainer = new WebMarkupContainer(ID_KIND_CONTAINER);
+ kindContainer.add(new VisibleEnableBehaviour(){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isVisible() {
+ return ResourceType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName());
+ }
+ });
+ kindContainer.setOutputMarkupId(true);
+ add(kindContainer);
+
+ DropDownChoicePanel kindSelector = WebComponentUtil.createEnumPanel(ShadowKindType.class, ID_KIND,
+ WebComponentUtil.createReadonlyModelFromEnum(ShadowKindType.class), Model.of(ShadowKindType.ACCOUNT),TypedAssignablePanel.this, false);
+ kindSelector.setOutputMarkupId(true);
+ kindSelector.getBaseFormComponent().add(new VisibleEnableBehaviour(){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled(){
+ return ResourceType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName()) && getSelectedResourceCount() > 0;
+ }
+ });
+ kindSelector.getBaseFormComponent().add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ target.add(TypedAssignablePanel.this);
+ }
+ });
+ kindSelector.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
+ kindSelector.setOutputMarkupPlaceholderTag(true);
+ kindContainer.add(kindSelector);
+
+ WebMarkupContainer intentContainer = new WebMarkupContainer(ID_INTENT_CONTAINER);
+ intentContainer.add(new VisibleEnableBehaviour(){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isVisible() {
+ return ResourceType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName());
+ }
+ });
+ intentContainer.setOutputMarkupId(true);
+ add(intentContainer);
+
+ DropDownChoicePanel intentSelector = new DropDownChoicePanel(ID_INTENT,
+ intentValueModel, intentValues);
+ intentSelector.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
+ intentSelector.getBaseFormComponent().add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ target.add(TypedAssignablePanel.this);
+ }
+ });
+ intentSelector.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
+ intentSelector.setOutputMarkupId(true);
+ intentSelector.setOutputMarkupPlaceholderTag(true);
+ intentSelector.getBaseFormComponent().add(new VisibleEnableBehaviour(){
private static final long serialVersionUID = 1L;
@Override
public boolean isEnabled(){
- return !ResourceType.COMPLEX_TYPE.equals(typeModel.getObject());
+ return ResourceType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName()) && getSelectedResourceCount() > 0;
}
+ });
+ intentContainer.add(intentSelector);
- @Override
- public boolean isVisible() {
- return TypedAssignablePanel.this.isRelationPanelVisible();
- }
+ WebMarkupContainer orgTreeViewContainer = new WebMarkupContainer(ID_ORG_TREE_VIEW_CONTAINER);
+ orgTreeViewContainer.setOutputMarkupId(true);
+ orgTreeViewContainer.add(new VisibleEnableBehaviour(){
+ private static final long serialVersionUID = 1L;
- });
- relationSelector.setOutputMarkupId(true);
- relationSelector.setOutputMarkupPlaceholderTag(true);
- add(relationSelector);
+ @Override
+ public boolean isVisible(){
+ boolean res= OrgType.COMPLEX_TYPE.equals(typeModel.getObject().getTypeQName());
+ return res;
+ }
+ });
+ add(orgTreeViewContainer);
+
+ CheckBox orgTreeViewCheckbox = new CheckBox(ID_ORG_TREE_VIEW, orgTreeViewModel);
+ orgTreeViewCheckbox.add(new AjaxEventBehavior("change") {
+ @Override
+ protected void onEvent(AjaxRequestTarget ajaxRequestTarget) {
+ orgTreeViewModel.setObject(!orgTreeViewModel.getObject());
+ ajaxRequestTarget.add(TypedAssignablePanel.this);
+ }
+ });
+ orgTreeViewCheckbox.setOutputMarkupId(true);
+ orgTreeViewContainer.add(orgTreeViewCheckbox);
+
+ }
+ private boolean isOrgTreeViewSelected(){
+ CheckBox checkPanel = (CheckBox) TypedAssignablePanel.this.get(ID_ORG_TREE_VIEW_CONTAINER).get(ID_ORG_TREE_VIEW);
+ return checkPanel.getModel().getObject();
}
private List getSelectedData(String id){
@@ -201,7 +361,7 @@ private List getSelectedData(String id){
}
private QName getSelectedRelation(){
- DropDownChoicePanel relationPanel = (DropDownChoicePanel) get(ID_RELATION);
+ DropDownChoicePanel relationPanel = (DropDownChoicePanel) get(ID_RELATION_CONTAINER).get(ID_RELATION);
RelationTypes relation = relationPanel.getModel().getObject();
if (relation == null) {
return SchemaConstants.ORG_DEFAULT;
@@ -209,6 +369,21 @@ private QName getSelectedRelation(){
return relation.getRelation();
}
+ private ShadowKindType getKind(){
+ DropDownChoicePanel kindPanel = getKindDropdownComponent();
+ ShadowKindType kind = kindPanel.getModel().getObject();
+ if (kind == null) {
+ return ShadowKindType.ACCOUNT;
+ }
+ return kind;
+ }
+
+ private String getIntent(){
+ DropDownChoicePanel intentPanel = getIntentDropdownComponent();
+ String intent = intentPanel.getBaseFormComponent().getModelObject();
+ return intent == null ? "default" : intent;
+ }
+
private WebMarkupContainer createCountContainer(){
WebMarkupContainer countContainer = new WebMarkupContainer(ID_COUNT_CONTAINER);
countContainer.setOutputMarkupId(true);
@@ -230,8 +405,8 @@ protected void onClick(AjaxRequestTarget target, T focus) {
}
private void refreshCounts(AjaxRequestTarget target) {
- addOrReplace(createCountContainer());
- target.add(get(ID_COUNT_CONTAINER));
+// addOrReplace(createCountContainer());
+// target.add(get(ID_COUNT_CONTAINER));
}
private PopupObjectListPanel createObjectListPanel(String id, final String countId, final ObjectTypes type) {
@@ -239,12 +414,30 @@ private PopupObjectListPanel createObjectListPanel(String id, final String co
private static final long serialVersionUID = 1L;
-
@Override
protected void onUpdateCheckbox(AjaxRequestTarget target) {
+ if (type.equals(ObjectTypes.RESOURCE)) {
+ target.add(TypedAssignablePanel.this);
+ }
refreshCounts(target);
}
+ @Override
+ protected IModel getCheckBoxEnableModel(IModel> rowModel){
+ if (type.equals(ObjectTypes.RESOURCE)) {
+ return new LoadableModel() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected Boolean load() {
+ return getSelectedResourceCount() == 0 || (rowModel != null && rowModel.getObject().isSelected());
+ }
+ };
+
+ } else {
+ return Model.of(true);
+ }
+ }
@Override
protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
@@ -283,6 +476,9 @@ protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
@Override
public boolean isVisible() {
+ if (typeModel.getObject().getTypeQName().equals(OrgType.COMPLEX_TYPE)){
+ return type.equals(typeModel.getObject()) && !isOrgTreeViewSelected();
+ }
return type.equals(typeModel.getObject());
}
});
@@ -293,7 +489,7 @@ protected boolean isRelationPanelVisible() {
return true;
}
- protected void addPerformed(AjaxRequestTarget target, List selected, QName relation) {
+ protected void addPerformed(AjaxRequestTarget target, List selected, QName relation, ShadowKindType kind, String intent) {
getPageBase().hideMainPopup(target);
}
@@ -317,4 +513,55 @@ public Component getComponent() {
return this;
}
+ private LoadableModel> getIntentAvailableValuesModel(){
+ return new LoadableModel>(true){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected List load(){
+ List availableIntentValues = new ArrayList<>();
+ if (getResourceTable() != null) {
+ List selectedResources = getResourceTable().getSelectedObjects();
+ if (selectedResources != null && selectedResources.size() > 0) {
+ ResourceType selectedResource = (ResourceType) selectedResources.get(0);
+
+ try {
+ RefinedResourceSchema refinedSchema = RefinedResourceSchema.getRefinedSchema(selectedResource.asPrismObject());
+ if (refinedSchema != null) {
+ ShadowKindType kind = (ShadowKindType) TypedAssignablePanel.this.getKindDropdownComponent().getBaseFormComponent().getModelObject();
+ List definitions = refinedSchema.getRefinedDefinitions(kind);
+ for (RefinedObjectClassDefinition def : definitions) {
+ availableIntentValues.add(def.getIntent());
+ }
+ }
+ } catch (SchemaException ex) {
+ LOGGER.error("Cannot get refined resource schema for resource {}. {}", selectedResource.getName().getOrig(), ex.getLocalizedMessage());
+ }
+
+ }
+ }
+ return availableIntentValues;
+ }
+ };
+ }
+
+ private DropDownChoicePanel getKindDropdownComponent(){
+ return (DropDownChoicePanel)get(ID_KIND_CONTAINER).get(ID_KIND);
+ }
+
+ private DropDownChoicePanel getIntentDropdownComponent(){
+ return (DropDownChoicePanel)get(ID_INTENT_CONTAINER).get(ID_INTENT);
+ }
+
+ private PopupObjectListPanel getResourceTable(){
+ return (PopupObjectListPanel)get(createComponentPath(ID_TABLES_CONTAINER, ID_RESOURCE_TABLE));
+ }
+ private int getSelectedResourceCount(){
+ return getResourceTable().getSelectedObjectsCount();
+
+ }
+
+ protected List getObjectTypesList(){
+ return WebComponentUtil.createAssignableTypesList();
+ }
}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java
index 75dc48442e0..0ea9239a09f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java
@@ -1,14 +1,26 @@
+/*
+ * Copyright (c) 2010-2017 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.
+ */
package com.evolveum.midpoint.gui.api.component.autocomplete;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.xml.namespace.QName;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
@@ -16,9 +28,7 @@
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.IConverter;
-import com.evolveum.midpoint.gui.api.component.path.ItemPathDto;
import com.evolveum.midpoint.prism.ItemDefinition;
public class AutoCompleteItemDefinitionPanel extends AbstractAutoCompletePanel {
@@ -33,7 +43,7 @@ public AutoCompleteItemDefinitionPanel(String id, final IModel
}
private void initLayout(final IModel> model) {
- final Model itemDefinitionAsStringModel = new Model(null);
+ final Model itemDefinitionAsStringModel = new Model<>(null);
AutoCompleteTextField input = new AutoCompleteTextField(
ID_INPUT, itemDefinitionAsStringModel, String.class, createAutoCompleteSettings()) {
@@ -76,7 +86,7 @@ protected void onUpdate(AjaxRequestTarget target) {
}
protected Map> listChoices(String input){
- return new HashMap>();
+ return new HashMap<>();
}
@Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
index a1983316936..cc9653d216e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
@@ -16,7 +16,6 @@
package com.evolveum.midpoint.gui.api.component.autocomplete;
-import com.evolveum.midpoint.web.component.prism.PrismValuePanel;
import com.evolveum.midpoint.web.model.LookupPropertyModel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -104,7 +103,9 @@ public void checkInputValue(AutoCompleteTextField input, AjaxRequestTarget targe
if (input.getInput() == null || input.getInput().trim().equals("")){
model.setObject(input.getInput());
}
- if (getIterator(input.getInput()).hasNext() && getIterator(input.getInput()).next() instanceof String) {
+ if (!getIterator(input.getInput()).hasNext()) {
+ updateFeedbackPanel(input, true, target);
+ } else {
Iterator lookupTableValuesIterator = (Iterator) getIterator(input.getInput());
String value = input.getInput();
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
index 22be2fdfd32..974e335d30a 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
@@ -1,16 +1,12 @@
package com.evolveum.midpoint.gui.api.component.captcha;
-import java.util.Random;
-
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource;
-import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.feedback.ContainerFeedbackMessageFilter;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
import com.evolveum.midpoint.gui.api.component.BasePanel;
@@ -57,7 +53,7 @@ public void onClick(AjaxRequestTarget target) {
add(changeCaptchaLink);
add(new RequiredTextField("text",
- new PropertyModel(CaptchaPanel.this, "captchaText"), String.class) {
+ new PropertyModel<>(CaptchaPanel.this, "captchaText"), String.class) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/form/CheckBoxPanel.html
similarity index 51%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.html
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/form/CheckBoxPanel.html
index 94b0003c8e7..c155bf9d3ab 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/form/CheckBoxPanel.html
@@ -1,5 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+