Added authorizations for audit log page and History tab on edit user …

…page
Evolveum · Nov 25, 2016 · 0d95a6b · 0d95a6b
1 parent a4ae342
commit 0d95a6b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -1104,10 +1104,12 @@ private MainMenuItem createReportsItems() {
 		submenu.add(created);
 		MenuItem n = new MenuItem(createStringResource("PageAdmin.menu.top.reports.new"), PageNewReport.class);
 		submenu.add(n);
-        MenuItem auditLogViewer = new MenuItem(createStringResource("PageAuditLogViewer.menuName"),
-                PageAuditLogViewer.class);
-        submenu.add(auditLogViewer);
 
+		if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.AUDIT_READ.getUrl())){
+			MenuItem auditLogViewer = new MenuItem(createStringResource("PageAuditLogViewer.menuName"),
+					PageAuditLogViewer.class);
+			submenu.add(auditLogViewer);
+		}
 		return item;
 	}
 

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
@@ -49,7 +49,7 @@
 
                     <label><wicket:message key="PageAuditLogViewer.hostIdentifierLabel" /></label>
                     <div wicket:id="hostIdentifierField" />
-                    <div><a class="btn btn-primary" wicket:id="searchButton"/></div>
+                    <span class="btn-group" style="float:right; padding-top: 5px;"><a class="btn btn-primary" wicket:id="searchButton"/></span>
                 </div>
             </div>
             <div wicket:id="table"/>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.FocusTabVisibleBehavior;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.model.api.ModelAuthorizationAction;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
@@ -41,6 +42,7 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
 import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;
+import com.evolveum.midpoint.web.page.admin.reports.PageAuditLogViewer;
 import com.evolveum.midpoint.web.page.admin.users.component.AssignmentsPreviewDto;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -175,17 +177,21 @@ protected AbstractObjectMainPanel<UserType> createMainPanel(String id) {
         return new FocusMainPanel<UserType>(id, getObjectModel(), getAssignmentsModel(), getProjectionModel(), this) {
             @Override
             protected void addSpecificTabs(final PageAdminObjectDetails<UserType> parentPage, List<ITab> tabs) {
-                FocusTabVisibleBehavior authorization = new FocusTabVisibleBehavior(unwrapModel(), ComponentConstants.UI_FOCUS_TAB_OBJECT_HISTORY_URL);
-                tabs.add(
-                        new PanelTab(parentPage.createStringResource("pageAdminFocus.objectHistory"), authorization) {
+                FocusTabVisibleBehavior authorization;
+                if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.AUDIT_READ.getUrl())){
+                    authorization = new FocusTabVisibleBehavior(unwrapModel(), ComponentConstants.UI_FOCUS_TAB_OBJECT_HISTORY_URL);
+                    tabs.add(
+                            new PanelTab(parentPage.createStringResource("pageAdminFocus.objectHistory"), authorization) {
 
-                            private static final long serialVersionUID = 1L;
+                                private static final long serialVersionUID = 1L;
+
+                                @Override
+                                public WebMarkupContainer createPanel(String panelId) {
+                                    return createObjectHistoryTabPanel(panelId, parentPage);
+                                }
+                            });
+                }
 
-                            @Override
-                            public WebMarkupContainer createPanel(String panelId) {
-                                return createObjectHistoryTabPanel(panelId, parentPage);
-                            }
-                        });
                 authorization = new FocusTabVisibleBehavior(unwrapModel(),
                         ComponentConstants.UI_FOCUS_TAB_DELEGATIONS_URL);
                 tabs.add(new CountablePanelTab(parentPage.createStringResource("FocusType.delegations"), authorization)