-
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' into feature/new-ws
- Loading branch information
Showing
52 changed files
with
2,123 additions
and
302 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
22 changes: 22 additions & 0 deletions
22
...c/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPopupPanel.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,22 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2019 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. | ||
| --> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:panel> | ||
| <div wicket:id="operationResultsPanel" /> | ||
| </wicket:panel> | ||
| </body> | ||
| </html> |
71 changes: 71 additions & 0 deletions
71
...c/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPopupPanel.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,71 @@ | ||
| /* | ||
| * Copyright (c) 2020 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.api.component.result; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.component.BasePanel; | ||
| import com.evolveum.midpoint.schema.result.OperationResult; | ||
| import com.evolveum.midpoint.web.component.dialog.Popupable; | ||
|
|
||
| import org.apache.wicket.Component; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.Model; | ||
| import org.apache.wicket.model.StringResourceModel; | ||
|
|
||
| /** | ||
| * @author honchar | ||
| */ | ||
| public class OperationResultPopupPanel extends BasePanel<OperationResult> implements Popupable { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final String ID_OPERATION_RESULTS_PANEL = "operationResultsPanel"; | ||
|
|
||
| public OperationResultPopupPanel(String id, IModel<OperationResult> model){ | ||
| super(id, model); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onInitialize(){ | ||
| super.onInitialize(); | ||
|
|
||
| OperationResultPanel operationResultPanel = new OperationResultPanel(ID_OPERATION_RESULTS_PANEL, | ||
| Model.of(OpResult.getOpResult(getPageBase(), getModelObject())), getPageBase()); | ||
| operationResultPanel.setOutputMarkupId(true); | ||
| add(operationResultPanel); | ||
| } | ||
|
|
||
| @Override | ||
| public int getWidth() { | ||
| return 800; | ||
| } | ||
|
|
||
| @Override | ||
| public int getHeight() { | ||
| return 600; | ||
| } | ||
|
|
||
| @Override | ||
| public String getWidthUnit(){ | ||
| return "px"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getHeightUnit(){ | ||
| return "px"; | ||
| } | ||
|
|
||
| @Override | ||
| public StringResourceModel getTitle() { | ||
| return new StringResourceModel("OperationResultPopupPanel.title"); | ||
| } | ||
|
|
||
| @Override | ||
| public Component getComponent() { | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
| } |
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
26 changes: 26 additions & 0 deletions
26
...om/evolveum/midpoint/web/security/util/MidpointSamlLocalServiceProviderConfiguration.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,26 @@ | ||
| /* | ||
| * Copyright (c) 2010-2019 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.web.security.util; | ||
|
|
||
| import org.springframework.security.saml.provider.service.config.LocalServiceProviderConfiguration; | ||
|
|
||
| /** | ||
| * @author skublik | ||
| */ | ||
|
|
||
| public class MidpointSamlLocalServiceProviderConfiguration extends LocalServiceProviderConfiguration { | ||
|
|
||
| private String aliasForPath; | ||
|
|
||
| public String getAliasForPath() { | ||
| return aliasForPath; | ||
| } | ||
|
|
||
| public void setAliasForPath(String aliasForPath) { | ||
| this.aliasForPath = aliasForPath; | ||
| } | ||
| } |
Oops, something went wrong.