Merge remote-tracking branch 'origin/master'

Evolveum · Apr 7, 2020 · 12d044b · 12d044b
2 parents 1d2b306 + 03c869e
commit 12d044b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -4047,6 +4047,7 @@ public static void workItemApproveActionPerformed(AjaxRequestTarget target, Case
             }
         }
         result.computeStatusIfUnknown();
+        pageBase.showResult(result);
     }
 
     public static List<ObjectOrdering> createMetadataOrdering(SortParam<String> sortParam, String metadataProperty, PrismContext prismContext){

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
@@ -102,7 +102,7 @@ protected void createBreadcrumb() {
     private MyPasswordsDto loadPageModel() {
         LOGGER.debug("Loading user and accounts.");
 
-        MyPasswordsDto dto;
+        MyPasswordsDto dto = new MyPasswordsDto();
         OperationResult result = new OperationResult(OPERATION_LOAD_USER_WITH_ACCOUNTS);
         try {
             String focusOid = SecurityUtils.getPrincipalUser().getOid();
@@ -130,7 +130,6 @@ private MyPasswordsDto loadPageModel() {
             result.recordFatalError(getString("PageAbstractSelfCredentials.message.couldntLoadAccounts.fatalError"), ex);
         } finally {
             result.recomputeStatus();
-            dto = new MyPasswordsDto();
         }
 
         Collections.sort(dto.getAccounts());