Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resource Wizard update - removing creating obsolete attribute and ass…
…ociation container in resource wizard that were causing problems. Improved work with Attribute and association references - added new QNameEditor component for editing custom, non-schema reference. Fixed few small (mostly visual) issues on the way
- Loading branch information
Erik Suta
committed
Oct 16, 2014
1 parent
5d53b91
commit ac625e2
Showing
10 changed files
with
289 additions
and
48 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2013 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. | ||
| --> | ||
|
|
||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <wicket:panel> | ||
|
|
||
| <dl class="dl-horizontal"> | ||
| <dt> | ||
| <label><wicket:message key="QNameEditor.label.attribute" /></label> | ||
| <i wicket:id="attributeTooltip" wicket:message="title:QNameEditor.tooltip.attribute"/> | ||
| </dt> | ||
| <dd> | ||
| <input wicket:id="attribute" type="text" class="form-control input-sm"/> | ||
| </dd> | ||
| </dl> | ||
|
|
||
| <dl class="dl-horizontal"> | ||
| <dt> | ||
| <label><wicket:message key="QNameEditor.label.namespace" /></label> | ||
| <i wicket:id="namespaceTooltip" wicket:message="title:QNameEditor.tooltip.namespace"/> | ||
| </dt> | ||
| <dd> | ||
| <select wicket:id="namespace" class="form-control input-sm"></select> | ||
| </dd> | ||
| </dl> | ||
|
|
||
| </wicket:panel> | ||
| </html> |
99 changes: 99 additions & 0 deletions
99
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright (c) 2010-2014 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.web.component.input; | ||
|
|
||
| import com.evolveum.midpoint.web.component.util.SimplePanel; | ||
| import com.evolveum.midpoint.web.util.InfoTooltipBehavior; | ||
| import org.apache.wicket.markup.html.basic.Label; | ||
| import org.apache.wicket.markup.html.form.DropDownChoice; | ||
| import org.apache.wicket.markup.html.form.TextField; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.PropertyModel; | ||
|
|
||
| import javax.xml.namespace.QName; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author shood | ||
| * */ | ||
| public class QNameEditorPanel extends SimplePanel<QName>{ | ||
|
|
||
| private static final String ID_ATTRIBUTE = "attribute"; | ||
| private static final String ID_NAMESPACE = "namespace"; | ||
| private static final String ID_T_ATTRIBUTE = "attributeTooltip"; | ||
| private static final String ID_T_NAMESPACE = "namespaceTooltip"; | ||
|
|
||
| public QNameEditorPanel(String id, IModel<QName> model){ | ||
| super(id, model); | ||
| } | ||
|
|
||
| @Override | ||
| public IModel<QName> getModel() { | ||
| IModel<QName> model = super.getModel(); | ||
| QName modelObject = model.getObject(); | ||
|
|
||
| if(modelObject == null){ | ||
| model.setObject(new QName("")); | ||
| } | ||
|
|
||
| return model; | ||
| } | ||
|
|
||
| @Override | ||
| protected void initLayout(){ | ||
|
|
||
| TextField attribute = new TextField<>(ID_ATTRIBUTE, new PropertyModel<String>(getModel(), "localPart")); | ||
| attribute.setOutputMarkupId(true); | ||
| attribute.setOutputMarkupPlaceholderTag(true); | ||
| attribute.setRequired(true); | ||
| add(attribute); | ||
|
|
||
| DropDownChoice namespace = new DropDownChoice<>(ID_NAMESPACE, new PropertyModel<String>(getModel(), "namespaceURI"), | ||
| prepareNamespaceList()); | ||
| namespace.setOutputMarkupId(true); | ||
| namespace.setOutputMarkupPlaceholderTag(true); | ||
| namespace.setNullValid(false); | ||
| namespace.setRequired(true); | ||
| add(namespace); | ||
|
|
||
| Label attrTooltip = new Label(ID_T_ATTRIBUTE); | ||
| attrTooltip.add(new InfoTooltipBehavior()); | ||
| attrTooltip.setOutputMarkupPlaceholderTag(true); | ||
| add(attrTooltip); | ||
|
|
||
| Label namespaceTooltip = new Label(ID_T_NAMESPACE); | ||
| namespaceTooltip.add(new InfoTooltipBehavior()); | ||
| namespaceTooltip.setOutputMarkupPlaceholderTag(true); | ||
| add(namespaceTooltip); | ||
| } | ||
|
|
||
| protected List<String> prepareNamespaceList(){ | ||
| List<String> list = new ArrayList<>(); | ||
|
|
||
| //icfs | ||
| list.add("http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"); | ||
| //ri | ||
| list.add("http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"); | ||
|
|
||
| return list; | ||
| } | ||
|
|
||
| // public boolean isRequired(){ | ||
| // return false; | ||
| // } | ||
| } |
18 changes: 18 additions & 0 deletions
18
...n-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # | ||
| # Copyright (c) 2010-2013 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. | ||
| # | ||
|
|
||
| QNameEditor.label.attribute=Ref. attribute | ||
| QNameEditor.label.namespace=Ref. namespace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.