Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
- Loading branch information
Showing
16 changed files
with
636 additions
and
12 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
33 changes: 33 additions & 0 deletions
33
...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageAdminServices.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,33 @@ | ||
| /* | ||
| * Copyright (c) 2010-2015 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.page.admin.services; | ||
|
|
||
|
|
||
| import com.evolveum.midpoint.security.api.AuthorizationConstants; | ||
| import com.evolveum.midpoint.web.page.admin.PageAdmin; | ||
|
|
||
| /** | ||
| * @author lazyman | ||
| */ | ||
| public class PageAdminServices extends PageAdmin { | ||
|
|
||
| public static final String AUTH_SERVICES_ALL = AuthorizationConstants.AUTZ_UI_SERVICES_ALL_URL; | ||
| public static final String AUTH_SERVICES_ALL_LABEL = "PageAdminServices.auth.servicesAll.label"; | ||
| public static final String AUTH_SERVICES_ALL_DESCRIPTION = "PageAdminServices.auth.servicesAll.description"; | ||
|
|
||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.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,47 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ 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. | ||
| --> | ||
|
|
||
| <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:extend> | ||
| <wicket:child /> | ||
|
|
||
| <!-- <div wicket:id="assignmentsPreviewPopup" /> --> | ||
| <!--<form wicket:id="mainForm" autocomplete="off" class="form-horizontal">--> | ||
| <!----> | ||
| <!--<div wicket:id="summaryPanel"/>--> | ||
|
|
||
| <!--<div wicket:id="tabPanel" class="nav-tabs-custom" />--> | ||
|
|
||
| <!--<div style="margin: 20px 0;" class="form-group" wicket:id="executeOptions" />--> | ||
|
|
||
| <!--<div wicket:id="progressPanel">[Status indicator here]</div>--> | ||
|
|
||
| <!--<div class="main-button-bar">--> | ||
| <!--<span class="button-group">--> | ||
| <!--<a class="btn btn-default" wicket:id="back"/>--> | ||
| <!--</span>--> | ||
| <!--<!– todo implement previes –>--> | ||
| <!----> | ||
| <!--<a class="btn btn-primary" wicket:id="save"/>--> | ||
| <!--<a class="btn btn-danger" wicket:id="abort"/>--> | ||
| <!--</div>--> | ||
| <!--</form>--> | ||
|
|
||
| </wicket:extend> | ||
| </body> | ||
| </html> |
72 changes: 72 additions & 0 deletions
72
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.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,72 @@ | ||
| package com.evolveum.midpoint.web.page.admin.services; | ||
|
|
||
| import org.apache.wicket.request.mapper.parameter.PageParameters; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.page.PageBase; | ||
| import com.evolveum.midpoint.prism.PrismObject; | ||
| import com.evolveum.midpoint.security.api.AuthorizationConstants; | ||
| import com.evolveum.midpoint.util.logging.Trace; | ||
| import com.evolveum.midpoint.util.logging.TraceManager; | ||
| import com.evolveum.midpoint.web.application.AuthorizationAction; | ||
| import com.evolveum.midpoint.web.application.PageDescriptor; | ||
| import com.evolveum.midpoint.web.component.FocusSummaryPanel; | ||
| import com.evolveum.midpoint.web.component.objectdetails.AbstractObjectMainPanel; | ||
| import com.evolveum.midpoint.web.component.objectdetails.AbstractRoleMainPanel; | ||
| import com.evolveum.midpoint.web.component.progress.ProgressReportingAwarePage; | ||
| import com.evolveum.midpoint.web.page.admin.PageAdminAbstractRole; | ||
| import com.evolveum.midpoint.web.page.admin.users.component.ServiceSummaryPanel; | ||
| import com.evolveum.midpoint.web.util.OnePageParameterEncoder; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType; | ||
|
|
||
| @PageDescriptor(url = "/admin/service", encoder = OnePageParameterEncoder.class, action = { | ||
| @AuthorizationAction(actionUri = PageAdminServices.AUTH_SERVICES_ALL, label = PageAdminServices.AUTH_SERVICES_ALL_LABEL, description = PageAdminServices.AUTH_SERVICES_ALL_DESCRIPTION), | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_SERVICE_URL, label = "PageService.auth.role.label", description = "PageService.auth.role.description") }) | ||
| public class PageService extends PageAdminAbstractRole<ServiceType> implements ProgressReportingAwarePage{ | ||
|
|
||
| private static final Trace LOGGER = TraceManager.getTrace(PageService.class); | ||
|
|
||
| public PageService() { | ||
| initialize(null); | ||
| } | ||
|
|
||
| public PageService(final PrismObject<ServiceType> unitToEdit) { | ||
| initialize(unitToEdit); | ||
| } | ||
|
|
||
| public PageService(PageParameters parameters, PageBase previousPage) { | ||
| getPageParameters().overwriteWith(parameters); | ||
| setPreviousPage(previousPage); | ||
| initialize(null); | ||
| } | ||
|
|
||
| @Override | ||
| protected ServiceType createNewObject() { | ||
| return new ServiceType(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Class<ServiceType> getCompileTimeClass() { | ||
| return ServiceType.class; | ||
| } | ||
|
|
||
| @Override | ||
| protected Class getRestartResponsePage() { | ||
| return PageServices.class; | ||
| } | ||
|
|
||
| @Override | ||
| protected FocusSummaryPanel<ServiceType> createSummaryPanel() { | ||
| return new ServiceSummaryPanel(ID_SUMMARY_PANEL, getObjectModel()); | ||
| } | ||
|
|
||
| @Override | ||
| protected AbstractObjectMainPanel<ServiceType> createMainPanel(String id) { | ||
| return new AbstractRoleMainPanel<ServiceType>(id, getObjectModel(), getAssignmentsModel(), getProjectionModel(), getInducementsModel(), this); | ||
| } | ||
|
|
||
| @Override | ||
| public PageBase getDefaultBackPage() { | ||
| return new PageServices(); | ||
| } | ||
|
|
||
| } |
36 changes: 36 additions & 0 deletions
36
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.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,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ 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. | ||
| --> | ||
|
|
||
| <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:extend> | ||
| <!-- <div wicket:id="confirmDeletePopup" /> --> | ||
|
|
||
| <form wicket:id="mainForm" class="form-inline"> | ||
| <div wicket:id="table"/> | ||
| </form> | ||
|
|
||
| <!-- <wicket:fragment wicket:id="tableHeader"> --> | ||
| <!-- <div class="pull-left" wicket:id="executeOptions"/> --> | ||
|
|
||
| <!-- <form class="form-inline pull-right search-form" wicket:id="searchForm"> --> | ||
| <!-- <div wicket:id="search"/> --> | ||
| <!-- </form> --> | ||
| <!-- </wicket:fragment> --> | ||
| </wicket:extend> | ||
| </body> | ||
| </html> |
Oops, something went wrong.