Skip to content

Commit

Permalink
task menu item enable state fix
Browse files Browse the repository at this point in the history
  • Loading branch information
KaterynaHonchar committed Mar 10, 2020
1 parent 7598173 commit bd37a1c
Showing 1 changed file with 8 additions and 12 deletions.
Expand Up @@ -15,6 +15,8 @@
import javax.management.ObjectName;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.ObjectUtils;
Expand Down Expand Up @@ -1876,14 +1878,8 @@ private MainMenuItem createServerTasksItems() {

addMenuItem(item, "PageAdmin.menu.top.serverTasks.nodes", PageNodes.class);

MenuItem newTaskMenu = new MenuItem(createStringResource("PageAdmin.menu.top.serverTasks.new"), GuiStyleConstants.CLASS_PLUS_CIRCLE, PageTask.class, null,
new VisibleEnableBehaviour());
item.getItems().add(newTaskMenu);

MenuItem menuItem = new MenuItem(createStringResource("PageAdmin.menu.top.serverTasks.edit"),
PageTask.class, null, createVisibleDisabledBehaviorForEditMenu(PageTask.class));
item.getItems().add(menuItem);

createFocusPageNewEditMenu(item.getItems(), "PageAdmin.menu.top.serverTasks.new", "PageAdmin.menu.top.serverTasks.edit",
PageTask.class, false);


return item;
Expand Down Expand Up @@ -2074,8 +2070,8 @@ public boolean isVisible() {
return false;
}

if (getPage() instanceof PageAdminFocus) {
PageAdminFocus page = (PageAdminFocus) getPage();
if (getPage() instanceof PageAdminObjectDetails) {
PageAdminObjectDetails page = (PageAdminObjectDetails) getPage();
return page.isOidParameterExists() || page.isEditingFocus();
} else if (getPage() instanceof PageResourceWizard) {
PageResourceWizard page = (PageResourceWizard) getPage();
Expand All @@ -2102,8 +2098,8 @@ protected boolean isMenuActive() {
return false;
}

if (PageBase.this.getPage() instanceof PageAdminFocus) {
PageAdminFocus page = (PageAdminFocus) PageBase.this.getPage();
if (PageBase.this.getPage() instanceof PageAdminObjectDetails) {
PageAdminObjectDetails page = (PageAdminObjectDetails) PageBase.this.getPage();
return !page.isOidParameterExists() && !page.isEditingFocus();
} else if (PageBase.this.getPage() instanceof PageResourceWizard) {
PageResourceWizard page = (PageResourceWizard) PageBase.this.getPage();
Expand Down

0 comments on commit bd37a1c

Please sign in to comment.