Merge branch 'master' of https://github.com/Evolveum/midpoint into sc…

…hrodinger-testing
Evolveum · Jul 23, 2018 · a3c73f3 · a3c73f3
2 parents 7833bb9 + b7d10f2
commit a3c73f3
Show file tree

Hide file tree

Showing 46 changed files with 3,104 additions and 2,193 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
@@ -38,7 +38,7 @@ public abstract class AbstractPopupTabPanel<O extends ObjectType> extends BasePa
     private static final long serialVersionUID = 1L;
 
     private static final String ID_OBJECT_LIST_PANEL = "objectListPanel";
-    private static final String ID_PARAMETERS_PANEL = "parametersPanel";
+    protected static final String ID_PARAMETERS_PANEL = "parametersPanel";
     protected static final String ID_PARAMETERS_PANEL_FRAGMENT = "parametersPanelFragment";
 
     protected List<O> preSelectedObjects = new ArrayList<>();

diff --git a/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java b/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
@@ -97,7 +97,7 @@ public QName getRelationValue(){
     }
 
     private DropDownChoicePanel getRelationDropDown(){
-        return (DropDownChoicePanel)get(ID_RELATION_CONTAINER).get(ID_RELATION);
+        return (DropDownChoicePanel)get(ID_PARAMETERS_PANEL).get(ID_RELATION_CONTAINER).get(ID_RELATION);
     }
 
     @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -176,7 +176,7 @@ public void onClick(AjaxRequestTarget target) {
 //                        isVisible = ((PageBase) getPage()).getSecurityEnforcer().isAuthorized(ModelAuthorizationAction.ADD.getUrl(),
 //                                null, objectToCreate, null, null, null);
 //                    } catch (Exception ex){
-//                        LOGGER.error("Failed to check authorization for ADD action on new object of " + mainObjectListPanel.getType().getSimpleName()
+//                        LOGGER.error("Failed to check authorization for ADD action on new object of " + mainObjectListPanel.getQueryType().getSimpleName()
 //                                + " type, ", ex);
 //                    }
 //                    return isVisible;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
@@ -128,6 +128,6 @@ public QName getRelationValue(){
     }
 
     private DropDownChoicePanel getRelationDropDown(){
-        return (DropDownChoicePanel)get(ID_RELATION_CONTAINER).get(ID_RELATION);
+        return (DropDownChoicePanel)get(ID_PARAMETERS_PANEL).get(ID_RELATION_CONTAINER).get(ID_RELATION);
     }
 }
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
@@ -41,7 +41,6 @@
 import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
 import com.evolveum.midpoint.prism.query.builder.S_FilterEntryOrEmpty;
 import com.evolveum.midpoint.repo.api.CacheDispatcher;
-import com.evolveum.midpoint.repo.common.CacheRegistry;
 import com.evolveum.midpoint.repo.common.expression.Expression;
 import com.evolveum.midpoint.repo.common.expression.ExpressionEvaluationContext;
 import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
@@ -1681,7 +1680,7 @@ private void createSelfServiceMenu(SideBarMenuItem menu) {
         addMainMenuItem(menu, GuiStyleConstants.CLASS_ICON_CREDENTIALS, "PageAdmin.menu.credentials",
                 PageSelfCredentials.class);
         addMainMenuItem(menu, GuiStyleConstants.CLASS_ICON_REQUEST, "PageAdmin.menu.request",
-                PageAssignmentShoppingKart.class);
+                PageAssignmentShoppingCart.class);
 
         //GDPR feature.. temporary disabled MID-4281
 //        addMainMenuItem(menu, GuiStyleConstants.CLASS_ICON_CONSENT, "PageAdmin.menu.consent",

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java b/...rc/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
@@ -34,7 +34,7 @@
 import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
-import com.evolveum.midpoint.web.page.self.PageAssignmentShoppingKart;
+import com.evolveum.midpoint.web.page.self.PageAssignmentShoppingCart;
 import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
 import com.evolveum.midpoint.web.session.RoleCatalogStorage;
 import com.evolveum.midpoint.web.util.ExpressionUtil;
@@ -98,7 +98,7 @@ private void initShoppingCartPanel(PageAdminObjectDetails<R> parentPage){
 			public boolean isVisible(){
 				//show panel only in case if user came to object details from
 				// Role Catalog page
-				return PageAssignmentShoppingKart.class.equals(getPreviousPage(parentPage));
+				return PageAssignmentShoppingCart.class.equals(getPreviousPage(parentPage));
 			}
 		});
 		getMainForm().add(shoppingCartButtonsPanel);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
@@ -98,6 +98,11 @@ protected AbstractObjectMainPanel<RoleType> createMainPanel(String id) {
 		return new RoleMainPanel(id, getObjectModel(), getProjectionModel(), this){
 			private static final long serialVersionUID = 1L;
 
+			@Override
+			protected boolean isFocusHistoryPage(){
+				return PageRole.this.isFocusHistoryPage();
+			}
+
 			@Override
 			protected void viewObjectHistoricalDataPerformed(AjaxRequestTarget target, PrismObject<RoleType> object, String date){
 				PageRole.this.navigateToNext(new PageRoleHistory(object, date));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
@@ -100,6 +100,10 @@ protected void viewObjectHistoricalDataPerformed(AjaxRequestTarget target, Prism
 				PageService.this.navigateToNext(new PageServiceHistory(object, date));
 			}
 
+			@Override
+			protected boolean isFocusHistoryPage(){
+				return PageService.this.isFocusHistoryPage();
+			}
 		};
 	}
 

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
@@ -18,10 +18,15 @@
 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.web.application.AuthorizationAction;
+import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.component.FocusSummaryPanel;
 import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
+import com.evolveum.midpoint.web.page.admin.roles.PageAdminRoles;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import org.apache.wicket.model.IModel;
@@ -31,6 +36,11 @@
 /**
  * Created by honchar
  */
+@PageDescriptor(url = "/admin/serviceHistory", 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_HISTORY_URL,
+                label = "PageServiceHistory.auth.service.label",
+                description = "PageServiceHistory.auth.service.description") })
 public class PageServiceHistory extends PageService {
     private static final long serialVersionUID = 1L;
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
@@ -15,6 +15,7 @@
  */
 package com.evolveum.midpoint.web.page.admin.users;
 
+import com.evolveum.midpoint.web.page.admin.services.PageService;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.Model;
@@ -98,6 +99,11 @@ public AbstractRoleMemberPanel<OrgType> createMemberPanel(String panelId) {
 				return new OrgMemberPanel(panelId, Model.of(getObject().asObjectable()));
 			}
 
+			@Override
+			protected boolean isFocusHistoryPage(){
+				return PageOrgUnit.this.isFocusHistoryPage();
+			}
+
 			@Override
 			protected void viewObjectHistoricalDataPerformed(AjaxRequestTarget target, PrismObject<OrgType> object, String date){
 				PageOrgUnit.this.navigateToNext(new PageOrgUnitHistory(object, date));

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
@@ -179,7 +179,6 @@ public Iterator<SelectableBean<OrgType>> getRoots() {
 
         if (WebComponentUtil.showResultInPage(result)) {
             getPageBase().showResult(result);
-            throw new RestartResponseException(PageUsers.class);
         }
 
         List<SelectableBean<OrgType>> list = new ArrayList<>();

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) 2010-2018 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.
+  -->
+
+<wicket:panel xmlns:wicket="http://wicket.apache.org">
+    <div class="row">
+        <wicket:child />
+        <div wicket:id="shoppingCartItemsPanel" />
+    </div>
+</wicket:panel>