Merge branch 'master' into feature/wicket-serialization-checker

Evolveum · Jul 27, 2017 · f7c40ca · f7c40ca
2 parents ff4db26 + 005d258
commit f7c40ca
Show file tree

Hide file tree

Showing 66 changed files with 4,826 additions and 322 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
@@ -180,8 +180,8 @@ public boolean isVisible() {
                 if (pageBase instanceof PageSelfProfile){
                     return false;
                 }
-                if (pageBase instanceof PageUser
-                        && model.getObject() != null && !model.getObject().isEmpty()){
+                if (pageBase instanceof PageUser && !((PageUser) pageBase).isLoggedInUserPage()
+                        && model.getObject() != null){
                     return true;
                 }
                 return false;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2010-2017 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.component;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -432,9 +432,11 @@ private Panel createTypedInputComponent(String id) {
 
 //              if (ActivationType.F_ADMINISTRATIVE_STATUS.equals(definition.getName())) {
 //                  return WebComponentUtil.createEnumPanel(ActivationStatusType.class, id, new PropertyModel<ActivationStatusType>(valueWrapperModel, baseExpression), this);
-//              } else if(ActivationType.F_LOCKOUT_STATUS.equals(definition.getName())){
-//                  return new LockoutStatusPanel(id, valueWrapperModel.getObject(), new PropertyModel<LockoutStatusType>(valueWrapperModel, baseExpression));
-//              } else {
+//              } else
+                if(ActivationType.F_LOCKOUT_STATUS.equals(definition.getName())){
+                  return new LockoutStatusPanel(id, valueWrapperModel.getObject(), new PropertyModel<LockoutStatusType>(valueWrapperModel, baseExpression));
+                }
+//              else {
 //                  if (definition.getTypeName().getLocalPart().equals(ActivationStatusType.class.getSimpleName())) {
 //                      return WebComponentUtil.createEnumPanel(ActivationStatusType.class, id, new PropertyModel<ActivationStatusType>(valueWrapperModel, baseExpression), this);
 //                  }

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
@@ -21,6 +21,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.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.model.api.ModelAuthorizationAction;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
@@ -365,4 +366,10 @@ private void saveDelegationToUser(UserType user, List<AssignmentEditorDto> assig
         showResult(result);
     }
 
+    public boolean isLoggedInUserPage(){
+        return getObjectWrapper() != null && getObjectWrapper().getObject() != null &&
+                StringUtils.isNotEmpty(getObjectWrapper().getObject().asObjectable().getOid()) &&
+                getObjectWrapper().getObject().asObjectable().getOid().equals(WebModelServiceUtils.getLoggedInUserOid());
+    }
+
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -172,8 +172,10 @@ protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.
         requestAssignments.add(new VisibleEnableBehaviour(){
             @Override
             public boolean isEnabled(){
-                return getSessionStorage().getRoleCatalog().isMultiUserRequest() ||
-                        onlyWarnings() || areConflictsResolved();
+                return (getSessionStorage().getRoleCatalog().isMultiUserRequest() ||
+                        onlyWarnings() || areConflictsResolved()) &&
+                        getSessionStorage().getRoleCatalog().getAssignmentShoppingCart() != null &&
+                        getSessionStorage().getRoleCatalog().getAssignmentShoppingCart().size() > 0;
             }
         });
         mainForm.add(requestAssignments);
@@ -230,6 +232,7 @@ private void onSingleUserRequestPerformed(AjaxRequestTarget target) {
                 && StringUtils.isNotEmpty(backgroundTaskOperationResult.getBackgroundTaskOid())){
             result.setMessage(createStringResource("operation.com.evolveum.midpoint.web.page.self.PageRequestRole.taskCreated").getString());
             showResult(result);
+            clearStorage();
             setResponsePage(PageAssignmentShoppingKart.class);
             return;
         }
@@ -238,6 +241,7 @@ private void onSingleUserRequestPerformed(AjaxRequestTarget target) {
             target.add(getFeedbackPanel());
             target.add(PageAssignmentsList.this.get(ID_FORM));
         } else {
+            clearStorage();
             setResponsePage(PageAssignmentShoppingKart.class);
         }
     }
@@ -278,18 +282,13 @@ private void onMultiUserRequestPerformed(AjaxRequestTarget target) {
                     && StringUtils.isNotEmpty(backgroundTaskOperationResult.getBackgroundTaskOid())) {
                 result.setMessage(createStringResource("operation.com.evolveum.midpoint.web.page.self.PageRequestRole.taskCreated").getString());
                 showResult(result);
+                clearStorage();
                 setResponsePage(PageAssignmentShoppingKart.class);
                 return;
             }
             if (WebComponentUtil.isSuccessOrHandledError(result)
                     || OperationResultStatus.IN_PROGRESS.equals(result.getStatus())) {
-                SessionStorage storage = getSessionStorage();
-                if (storage.getRoleCatalog().getAssignmentShoppingCart() != null) {
-                    storage.getRoleCatalog().getAssignmentShoppingCart().clear();
-                }
-                if (storage.getRoleCatalog().getTargetUserList() != null){
-                    storage.getRoleCatalog().getTargetUserList().clear();
-                }
+                clearStorage();
                 setResponsePage(PageAssignmentShoppingKart.class);
             } else {
                 showResult(result);
@@ -298,6 +297,17 @@ private void onMultiUserRequestPerformed(AjaxRequestTarget target) {
             }
     }
 
+    private void clearStorage(){
+        SessionStorage storage = getSessionStorage();
+        if (storage.getRoleCatalog().getAssignmentShoppingCart() != null) {
+            storage.getRoleCatalog().getAssignmentShoppingCart().clear();
+        }
+        if (storage.getRoleCatalog().getTargetUserList() != null){
+            storage.getRoleCatalog().getTargetUserList().clear();
+        }
+        storage.getRoleCatalog().setRequestDescription("");
+    }
+
     private ContainerDelta handleAssignmentDeltas(ObjectDelta<UserType> focusDelta,
                                                   List<AssignmentEditorDto> assignments, PrismContainerDefinition def) throws SchemaException {
         ContainerDelta assDelta = new ContainerDelta(ItemPath.EMPTY_PATH, def.getName(), def, getPrismContext());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
@@ -22,7 +22,6 @@
 import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.page.admin.users.dto.TreeStateSet;
-import com.evolveum.midpoint.web.page.self.dto.AssignmentConflictDto;
 import com.evolveum.midpoint.web.page.self.dto.AssignmentViewType;
 import com.evolveum.midpoint.web.page.self.dto.ConflictDto;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;

diff --git a/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml b/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
@@ -49,6 +49,10 @@
 		<key>es</key>
 		<label>Español</label>
 	</row>
+	<row>
+		<key>fi</key>
+		<label>Suomi</label>
+	</row>
 	<row>
 		<key>hu</key>
 		<label>Magyar</label>

diff --git a/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml b/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
@@ -40,6 +40,10 @@
 		<key>es</key>
 		<label>Español</label>
 	</row>
+	<row>
+		<key>fi</key>
+		<label>Suomi</label>
+	</row>
 	<row>
 		<key>hu</key>
 		<label>Magyar</label>

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -3226,6 +3226,7 @@ ScenePanel.value=Hodnota
 SceneItemLinePanel.removedValue=Odebraná hodnota
 SceneItemLinePanel.addedValue=Přidaná hodnota
 SceneItemLinePanel.unchangedValue=Nezměněná hodnota
+SceneItemLinePanel.unknownLabel=(neznámé)
 operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Změnit vlastníka (GUI)
 TaskSummaryPanel.progressWithTotalKnown=Zpracování: {0} z {1}
 TaskSummaryPanel.progressWithTotalUnknown=Zpracování: {0}