From 3bd2f442d5a343d5c7bac86c34d569625c395d55 Mon Sep 17 00:00:00 2001 From: honchar Date: Mon, 3 Apr 2017 13:01:42 +0200 Subject: [PATCH] fix for Back button from self service section --- .../midpoint/gui/api/page/PageBase.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 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 index d2548ec4292..981aae5c2df 100644 --- 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 @@ -1683,17 +1683,20 @@ public DeploymentInformationType loadDeploymentInformationType() { public boolean canRedirectBack() { List breadcrumbs = getBreadcrumbs(); - // first is icon (non clickable), last is for "current page" and if there - // is nothing in between then we don't know where to redirect - if (breadcrumbs.size() < getMinimalBreadcrumbsListSize()) { - return false; + if (breadcrumbs.size() > 2) { + return true; + } + if (breadcrumbs.size() == 2){ + BreadcrumbPageClass breadcrumb = null; + if ((breadcrumbs.get(breadcrumbs.size() - 2)) instanceof BreadcrumbPageClass){ + breadcrumb = (BreadcrumbPageClass) breadcrumbs.get(breadcrumbs.size() - 2); + } + if (breadcrumb != null && breadcrumb.getPage() != null){ + return true; + } } - return true; - } - - protected int getMinimalBreadcrumbsListSize(){ - return 3; + return false; } public Breadcrumb redirectBack() {