-
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 remote-tracking branch 'origin/master' into feature/detaching
# Conflicts: # gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
- Loading branch information
Showing
45 changed files
with
624 additions
and
135 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
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
14 changes: 14 additions & 0 deletions
14
...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.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,14 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2018 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:extend> | ||
| <wicket:child /> | ||
| </wicket:extend> | ||
| </body> | ||
| </html> |
78 changes: 78 additions & 0 deletions
78
...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrgHistory.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,78 @@ | ||
| /* | ||
| * Copyright (c) 2010-2018 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.org; | ||
|
|
||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels; | ||
|
|
||
| import org.apache.wicket.model.IModel; | ||
|
|
||
| import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction; | ||
| import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor; | ||
| import com.evolveum.midpoint.authentication.api.authorization.Url; | ||
| import com.evolveum.midpoint.gui.api.model.LoadableModel; | ||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| 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.xml.ns._public.common.common_3.OrgType; | ||
|
|
||
| /** | ||
| * Created by honchar. | ||
| */ | ||
| @PageDescriptor( | ||
| urls = { | ||
| @Url(mountUrl = "/admin/orgUnitHistory", matchUrlForSecurity = "/admin/orgUnitHistory") | ||
| }, | ||
| action = { | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ORG_ALL_URL, | ||
| label = "PageAdminUsers.auth.orgAll.label", | ||
| description = "PageAdminUsers.auth.orgAll.description"), | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ORG_UNIT_HISTORY_URL, | ||
| label = "PageOrgUnitHistory.auth.orgUnitHistory.label", | ||
| description = "PageOrgUnitHistory.auth.orgUnitHistory.description")}) | ||
| public class PageOrgHistory extends PageOrg { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final String DOT_CLASS = PageOrgHistory.class.getName() + "."; | ||
| private static final Trace LOGGER = TraceManager.getTrace(PageOrgHistory.class); | ||
| private String date = ""; | ||
|
|
||
| public PageOrgHistory(final PrismObject<OrgType> org, String date) { | ||
| super(org); | ||
| this.date = date; | ||
| } | ||
|
|
||
| @Override | ||
| protected FocusDetailsModels<OrgType> createObjectDetailsModels(PrismObject<OrgType> object) { | ||
| return new FocusDetailsModels<OrgType>(createPrismObjectModel(object), this) { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| protected boolean isReadonly() { | ||
| return true; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| protected IModel<String> createPageTitleModel() { | ||
| return new LoadableModel<String>() { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| protected String load() { | ||
| String name = null; | ||
| if (getModelObjectType() != null) { | ||
| name = WebComponentUtil.getName(getModelObjectType()); | ||
| } | ||
| return createStringResource("PageUserHistory.title", name, date).getObject(); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| } |
14 changes: 14 additions & 0 deletions
14
...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.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,14 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2018 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:extend> | ||
| <wicket:child /> | ||
| </wicket:extend> | ||
| </body> | ||
| </html> |
79 changes: 79 additions & 0 deletions
79
...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRoleHistory.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,79 @@ | ||
| /* | ||
| * Copyright (c) 2010-2018 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.role; | ||
|
|
||
| import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels; | ||
| import com.evolveum.midpoint.gui.impl.page.admin.user.UserDetailsModel; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; | ||
|
|
||
| import org.apache.wicket.model.IModel; | ||
|
|
||
| import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction; | ||
| import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor; | ||
| import com.evolveum.midpoint.authentication.api.authorization.Url; | ||
| import com.evolveum.midpoint.gui.api.model.LoadableModel; | ||
| import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; | ||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| 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.component.ObjectSummaryPanel; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType; | ||
|
|
||
| /** | ||
| * Created by honchar | ||
| */ | ||
| @PageDescriptor( | ||
| urls = { | ||
| @Url(mountUrl = "/admin/roleHistory") | ||
| }, | ||
| action = { | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ROLES_ALL_URL, | ||
| label = "PageAdminRoles.auth.roleAll.label", | ||
| description = "PageAdminRoles.auth.roleAll.description"), | ||
| @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ROLE_HISTORY_URL, | ||
| label = "PageRoleHistory.auth.roleHistory.label", | ||
| description = "PageRoleHistory.auth.roleHistory.description")}) | ||
| public class PageRoleHistory extends PageRole { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private static final String DOT_CLASS = PageRoleHistory.class.getName() + "."; | ||
| private static final Trace LOGGER = TraceManager.getTrace(PageRoleHistory.class); | ||
| private String date = ""; | ||
|
|
||
| public PageRoleHistory(final PrismObject<RoleType> role, String date) { | ||
| super(role); | ||
| this.date = date; | ||
| } | ||
|
|
||
| @Override | ||
| protected FocusDetailsModels<RoleType> createObjectDetailsModels(PrismObject<RoleType> object) { | ||
| return new FocusDetailsModels<RoleType>(createPrismObjectModel(object), this) { | ||
| @Override | ||
| protected boolean isReadonly() { | ||
| return true; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| protected IModel<String> createPageTitleModel() { | ||
| return new LoadableModel<String>() { | ||
| @Override | ||
| protected String load() { | ||
| String name = null; | ||
| if (getModelObjectType() != null) { | ||
| name = WebComponentUtil.getName(getModelObjectType()); | ||
| } | ||
| return createStringResource("PageUserHistory.title", name, date).getObject(); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| } | ||
|
|
14 changes: 14 additions & 0 deletions
14
...i/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageServiceHistory.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,14 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2010-2018 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <body> | ||
| <wicket:extend> | ||
| <wicket:child /> | ||
| </wicket:extend> | ||
| </body> | ||
| </html> |
Oops, something went wrong.