-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:Evolveum/midpoint
# Conflicts: # gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDefaultViewPanel.java
- Loading branch information
Showing
280 changed files
with
9,950 additions
and
9,862 deletions.
There are no files selected for viewing
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
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
66 changes: 66 additions & 0 deletions
66
...ain/java/com/evolveum/midpoint/gui/impl/page/admin/objecttemplate/PageObjectTemplate.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,66 @@ | ||
| /* | ||
| * Copyright (c) 2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.page.admin.objecttemplate; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.model.LoadableModel; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.PageAssignmentHolderDetails; | ||
| import com.evolveum.midpoint.prism.PrismObject; | ||
| import com.evolveum.midpoint.security.api.AuthorizationConstants; | ||
| import com.evolveum.midpoint.web.application.AuthorizationAction; | ||
| import com.evolveum.midpoint.web.application.PageDescriptor; | ||
| import com.evolveum.midpoint.web.application.Url; | ||
| import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration; | ||
| import com.evolveum.midpoint.web.page.admin.objectTemplate.ObjectTemplateSummaryPanel; | ||
| import com.evolveum.midpoint.web.util.OnePageParameterEncoder; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType; | ||
| import org.apache.wicket.markup.html.panel.Panel; | ||
| import org.apache.wicket.request.mapper.parameter.PageParameters; | ||
|
|
||
| @PageDescriptor( | ||
| urls = { | ||
| @Url(mountUrl = "/admin/newObjectTemplate") | ||
| }, | ||
| encoder = OnePageParameterEncoder.class, | ||
| action = { | ||
| @AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL, | ||
| label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, | ||
| description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION), | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_OBJECT_TEMPLATES_ALL_URL, | ||
| label = "PageObjectCollection.auth.objectTemplatesAll.label", | ||
| description = "PageObjectCollection.auth.objectTemplatesAll.description"), | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_OBJECT_TEMPLATE_URL, | ||
| label = "PageObjectCollection.auth.objectTemplate.label", | ||
| description = "PageObjectCollection.auth.objectTemplate.description") | ||
| }) | ||
| public class PageObjectTemplate extends PageAssignmentHolderDetails<ObjectTemplateType, AssignmentHolderDetailsModel<ObjectTemplateType>> { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| public PageObjectTemplate() { | ||
| super(); | ||
| } | ||
|
|
||
| public PageObjectTemplate(PageParameters parameters) { | ||
| super(parameters); | ||
| } | ||
|
|
||
| public PageObjectTemplate(final PrismObject<ObjectTemplateType> obj) { | ||
| super(obj); | ||
| } | ||
|
|
||
| @Override | ||
| protected Class<ObjectTemplateType> getType() { | ||
| return ObjectTemplateType.class; | ||
| } | ||
|
|
||
| @Override | ||
| protected Panel createSummaryPanel(String id, LoadableModel<ObjectTemplateType> summaryModel) { | ||
| return new ObjectTemplateSummaryPanel(id, summaryModel, this); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...lveum/midpoint/gui/impl/page/admin/objecttemplate/component/ObjectTemplateItemsPanel.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,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2021 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:panel> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <div wicket:id="panel" /> | ||
| </div> | ||
| </div> | ||
| </wicket:panel> | ||
| </body> | ||
| </html> |
43 changes: 43 additions & 0 deletions
43
...lveum/midpoint/gui/impl/page/admin/objecttemplate/component/ObjectTemplateItemsPanel.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,43 @@ | ||
| /* | ||
| * Copyright (c) 2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.page.admin.objecttemplate.component; | ||
|
|
||
| import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel; | ||
| import com.evolveum.midpoint.gui.impl.prism.panel.ObjectTemplateItemPanel; | ||
| import com.evolveum.midpoint.util.logging.Trace; | ||
| import com.evolveum.midpoint.util.logging.TraceManager; | ||
| import com.evolveum.midpoint.web.application.PanelDisplay; | ||
| import com.evolveum.midpoint.web.application.PanelInstance; | ||
| import com.evolveum.midpoint.web.application.PanelType; | ||
| import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType; | ||
|
|
||
| @PanelType(name = "objectTemplateItems") | ||
| @PanelInstance(identifier = "objectTemplateItems", | ||
| applicableFor = ObjectTemplateType.class, | ||
| display = @PanelDisplay(label = "pageObjectTemplate.item.title", order = 30)) | ||
| public class ObjectTemplateItemsPanel extends AbstractObjectMainPanel<ObjectTemplateType, ObjectDetailsModels<ObjectTemplateType>> { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final Trace LOGGER = TraceManager.getTrace(ObjectTemplateItemsPanel.class); | ||
| private static final String ID_PANEL = "panel"; | ||
|
|
||
| private static final String DOT_CLASS = ObjectTemplateItemsPanel.class.getName() + "."; | ||
|
|
||
| public ObjectTemplateItemsPanel(String id, AssignmentHolderDetailsModel<ObjectTemplateType> model, ContainerPanelConfigurationType config) { | ||
| super(id, model, config); | ||
| } | ||
|
|
||
| @Override | ||
| protected void initLayout() { | ||
| add(new ObjectTemplateItemPanel(ID_PANEL, | ||
| PrismContainerWrapperModel.fromContainerWrapper(getObjectWrapperModel(), ObjectTemplateType.F_ITEM))); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...i/impl/page/admin/objecttemplate/component/ObjectTemplateIterationSpecificationPanel.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,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2021 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:panel> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <div wicket:id="panel" /> | ||
| </div> | ||
| </div> | ||
| </wicket:panel> | ||
| </body> | ||
| </html> |
45 changes: 45 additions & 0 deletions
45
...i/impl/page/admin/objecttemplate/component/ObjectTemplateIterationSpecificationPanel.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,45 @@ | ||
| /* | ||
| * Copyright (c) 2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.page.admin.objecttemplate.component; | ||
|
|
||
| import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel; | ||
| import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; | ||
| import com.evolveum.midpoint.util.logging.Trace; | ||
| import com.evolveum.midpoint.util.logging.TraceManager; | ||
| import com.evolveum.midpoint.web.application.PanelDisplay; | ||
| import com.evolveum.midpoint.web.application.PanelInstance; | ||
| import com.evolveum.midpoint.web.application.PanelType; | ||
| import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.*; | ||
|
|
||
| @PanelType(name = "iterationSpecification") | ||
| @PanelInstance(identifier = "iterationSpecification", | ||
| applicableFor = ObjectTemplateType.class, | ||
| display = @PanelDisplay(label = "pageObjectTemplate.iterationSpecification.title", order = 20)) | ||
| public class ObjectTemplateIterationSpecificationPanel extends AbstractObjectMainPanel<ObjectTemplateType, ObjectDetailsModels<ObjectTemplateType>> { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final Trace LOGGER = TraceManager.getTrace(ObjectTemplateIterationSpecificationPanel.class); | ||
| private static final String ID_PANEL = "panel"; | ||
|
|
||
| private static final String DOT_CLASS = ObjectTemplateIterationSpecificationPanel.class.getName() + "."; | ||
|
|
||
| public ObjectTemplateIterationSpecificationPanel(String id, AssignmentHolderDetailsModel<ObjectTemplateType> model, ContainerPanelConfigurationType config) { | ||
| super(id, model, config); | ||
| } | ||
|
|
||
| @Override | ||
| protected void initLayout() { | ||
| SingleContainerPanel panel = | ||
| new SingleContainerPanel<>(ID_PANEL, | ||
| PrismContainerWrapperModel.fromContainerWrapper(getObjectWrapperModel(), ObjectTemplateType.F_ITERATION_SPECIFICATION), | ||
| IterationSpecificationType.COMPLEX_TYPE); | ||
| add(panel); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...um/midpoint/gui/impl/page/admin/objecttemplate/component/ObjectTemplateMappingsPanel.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,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2021 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:panel> | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <div wicket:id="panel" /> | ||
| </div> | ||
| </div> | ||
| </wicket:panel> | ||
| </body> | ||
| </html> |
43 changes: 43 additions & 0 deletions
43
...um/midpoint/gui/impl/page/admin/objecttemplate/component/ObjectTemplateMappingsPanel.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,43 @@ | ||
| /* | ||
| * Copyright (c) 2021 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.page.admin.objecttemplate.component; | ||
|
|
||
| import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel; | ||
| import com.evolveum.midpoint.gui.impl.prism.panel.ListMappingPanel; | ||
| import com.evolveum.midpoint.util.logging.Trace; | ||
| import com.evolveum.midpoint.util.logging.TraceManager; | ||
| import com.evolveum.midpoint.web.application.PanelDisplay; | ||
| import com.evolveum.midpoint.web.application.PanelInstance; | ||
| import com.evolveum.midpoint.web.application.PanelType; | ||
| import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType; | ||
|
|
||
| @PanelType(name = "objectTemplateMappings") | ||
| @PanelInstance(identifier = "objectTemplateMappings", | ||
| applicableFor = ObjectTemplateType.class, | ||
| display = @PanelDisplay(label = "pageObjectTemplate.mapping.title", order = 40)) | ||
| public class ObjectTemplateMappingsPanel extends AbstractObjectMainPanel<ObjectTemplateType, ObjectDetailsModels<ObjectTemplateType>> { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final Trace LOGGER = TraceManager.getTrace(ObjectTemplateMappingsPanel.class); | ||
| private static final String ID_PANEL = "panel"; | ||
|
|
||
| private static final String DOT_CLASS = ObjectTemplateMappingsPanel.class.getName() + "."; | ||
|
|
||
| public ObjectTemplateMappingsPanel(String id, AssignmentHolderDetailsModel<ObjectTemplateType> model, ContainerPanelConfigurationType config) { | ||
| super(id, model, config); | ||
| } | ||
|
|
||
| @Override | ||
| protected void initLayout() { | ||
| add(new ListMappingPanel(ID_PANEL, | ||
| PrismContainerWrapperModel.fromContainerWrapper(getObjectWrapperModel(), ObjectTemplateType.F_MAPPING))); | ||
| } | ||
| } |
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.