Merge remote-tracking branch 'origin/master'

Evolveum · Jun 20, 2016 · 2ac62ff · 2ac62ff
2 parents 38fe6c0 + d0b542b
commit 2ac62ff
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
@@ -203,18 +203,15 @@ private void onSavePerformed(AjaxRequestTarget target) {
         if (backgroundTaskOperationResult != null
                 && StringUtils.isNotEmpty(backgroundTaskOperationResult.getBackgroundTaskOid())){
              result.setMessage(createStringResource("operation.com.evolveum.midpoint.web.page.self.PageRequestRole.taskCreated").getString());
+            showResult(result);
+            setResponsePage(PageRequestRole.class);
+            return;
         }
+        showResult(result);
         if (!WebComponentUtil.isSuccessOrHandledError(result)) {
-            showResult(result);
             target.add(getFeedbackPanel());
         } else {
-            showResult(result);
-            if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
-                    AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
-                setResponsePage(PageDashboard.class);
-            } else {
-                setResponsePage(PageSelfDashboard.class);
-            }
+            setResponsePage(PageRequestRole.class);
         }
     }