Skip to content

Commit

Permalink
MID-2587: fixing of "Configuration -> "Import object" also appends it…
Browse files Browse the repository at this point in the history
…em "Import resource definition" in Resource menu"
  • Loading branch information
KaterynaHonchar committed Nov 10, 2015
1 parent 492087d commit fce8ad4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
Expand Up @@ -51,6 +51,7 @@
import com.evolveum.midpoint.web.page.admin.reports.PageNewReport;
import com.evolveum.midpoint.web.page.admin.reports.PageReport;
import com.evolveum.midpoint.web.page.admin.reports.PageReports;
import com.evolveum.midpoint.web.page.admin.resources.PageImportResource;
import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
import com.evolveum.midpoint.web.page.admin.resources.PageResources;
import com.evolveum.midpoint.web.page.admin.roles.PageRole;
Expand Down Expand Up @@ -424,7 +425,7 @@ private MainMenuItem createResourcesItems() {
PageResourceWizard.class);
submenu.add(created);
MenuItem n = new MenuItem(createStringResource("PageAdmin.menu.top.resources.import"),
PageImportObject.class);
PageImportResource.class);
submenu.add(n);

return item;
Expand Down
@@ -0,0 +1,24 @@
package com.evolveum.midpoint.web.page.admin.resources;

import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration;
import com.evolveum.midpoint.web.page.admin.configuration.PageImportObject;

/**
* Created by honchar
* this class is created to link Import resource definition
* menu item to a separate class (to fix menu item enabling issue)
*
*/
@PageDescriptor(url = "/admin/config/import", action = {
@AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_CONFIGURATION_IMPORT_URL,
label = "PageImportObject.auth.configImport.label", description = "PageImportObject.auth.configImport.description")})
public class PageImportResource extends PageImportObject {
public PageImportResource(){

}
}

0 comments on commit fce8ad4

Please sign in to comment.