Skip to content

Commit

Permalink
system configuration page imrpovements..
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Oct 13, 2015
1 parent b8e211f commit 63cef1e
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 32 deletions.
37 changes: 35 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
View file
Expand Up @@ -516,8 +516,41 @@ public boolean isMenuActive(WebPage page) {
}

int index = getSelectedTabForConfiguration(page);
return (PageSystemConfiguration.CONFIGURATION_TAB_LOGGING == index
|| PageSystemConfiguration.CONFIGURATION_TAB_PROFILING == index) ? true : false;
return PageSystemConfiguration.CONFIGURATION_TAB_LOGGING == index ? true : false;
}
};
submenu.add(menu);

params = new PageParameters();
params.add(PageSystemConfiguration.SELECTED_TAB_INDEX, PageSystemConfiguration.CONFIGURATION_TAB_PROFILING);
menu = new MenuItem(createStringResource("PageAdmin.menu.top.configuration.profiling"),
PageSystemConfiguration.class, params, null) {

@Override
public boolean isMenuActive(WebPage page) {
if (!PageSystemConfiguration.class.equals(page.getClass())) {
return false;
}

int index = getSelectedTabForConfiguration(page);
return PageSystemConfiguration.CONFIGURATION_TAB_PROFILING == index ? true : false;
}
};
submenu.add(menu);

params = new PageParameters();
params.add(PageSystemConfiguration.SELECTED_TAB_INDEX, PageSystemConfiguration.CONFIGURATION_TAB_NOTIFICATION);
menu = new MenuItem(createStringResource("PageAdmin.menu.top.configuration.notifications"),
PageSystemConfiguration.class, params, null) {

@Override
public boolean isMenuActive(WebPage page) {
if (!PageSystemConfiguration.class.equals(page.getClass())) {
return false;
}

int index = getSelectedTabForConfiguration(page);
return PageSystemConfiguration.CONFIGURATION_TAB_NOTIFICATION == index ? true : false;
}
};
submenu.add(menu);
Expand Down
63 changes: 33 additions & 30 deletions ...n/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
View file
Expand Up @@ -16,15 +16,6 @@

package com.evolveum.midpoint.web.page.admin.configuration.dto;

import com.evolveum.midpoint.common.SystemConfigurationHolder;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
import com.evolveum.midpoint.schema.util.SystemConfigurationTypeUtil;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -36,6 +27,26 @@

import org.apache.commons.lang.StringUtils;

import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
import com.evolveum.midpoint.schema.util.SystemConfigurationTypeUtil;
import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AppenderConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPolicyEnforcementType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ClassLoggerConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CleanupPoliciesType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CleanupPolicyType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FileAppenderConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectPolicyConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ProjectionPolicyType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RichHyperlinkType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ValuePolicyType;

/**
* @author lazyman
*/
Expand Down Expand Up @@ -157,16 +168,20 @@ public SystemConfigurationType getOldObject(){
public SystemConfigurationType getNewObject() throws DatatypeConfigurationException{
SystemConfigurationType newObject = oldObject.clone();

String globalPasswordPolicyOid = getPassPolicyDto().getOid();
ObjectReferenceType globalPassPolicyRef = ObjectTypeUtil.createObjectRef(globalPasswordPolicyOid, ObjectTypes.PASSWORD_POLICY);
// ObjectReferenceType globalPassPolicyRef = new ObjectReferenceType();
// globalPassPolicyRef.setOid(globalPasswordPolicyOid);

String globalObjectTemplateOid = getObjectTemplateDto().getOid();
ObjectReferenceType globalObjectTemplateRef = ObjectTypeUtil.createObjectRef(globalObjectTemplateOid, ObjectTypes.OBJECT_TEMPLATE);
// ObjectReferenceType globalObjectTemplateRef = new ObjectReferenceType();
// globalObjectTemplateRef.setOid(globalObjectTemplateOid);
if (StringUtils.isNotBlank(getPassPolicyDto().getOid())){
ObjectReferenceType globalPassPolicyRef = ObjectTypeUtil.createObjectRef(getPassPolicyDto().getOid(), ObjectTypes.PASSWORD_POLICY);
newObject.setGlobalPasswordPolicyRef(globalPassPolicyRef);
} else {
newObject.setGlobalPasswordPolicyRef(null);
}

if (StringUtils.isNotBlank(getObjectTemplateDto().getOid())){
ObjectReferenceType globalObjectTemplateRef = ObjectTypeUtil.createObjectRef(getObjectTemplateDto().getOid(), ObjectTypes.OBJECT_TEMPLATE);
newObject.setDefaultUserTemplateRef(globalObjectTemplateRef);
} else {
newObject.setDefaultUserTemplateRef(null);
}

AssignmentPolicyEnforcementType globalAEP = AEPlevel.toAEPValueType(getAepLevel());
ProjectionPolicyType projectionPolicy = new ProjectionPolicyType();
projectionPolicy.setAssignmentPolicyEnforcement(globalAEP);
Expand All @@ -183,18 +198,6 @@ public SystemConfigurationType getNewObject() throws DatatypeConfigurationExcept
cleanupPolicies.setAuditRecords(auditCleanup);
cleanupPolicies.setClosedTasks(taskCleanup);

if (StringUtils.isEmpty(globalPasswordPolicyOid)) {
newObject.setGlobalPasswordPolicyRef(null);
} else {
newObject.setGlobalPasswordPolicyRef(globalPassPolicyRef);
}

if (StringUtils.isEmpty(globalObjectTemplateOid)) {
newObject.setDefaultUserTemplateRef(null);
} else {
newObject.setDefaultUserTemplateRef(globalObjectTemplateRef);
}

newObject.setGlobalAccountSynchronizationSettings(projectionPolicy);
newObject.setCleanupPolicy(cleanupPolicies);
SystemConfigurationTypeUtil.setEnableExperimentalCode(newObject, getEnableExperimentalCode());
Expand Down
2 changes: 2 additions & 0 deletions gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -1063,6 +1063,8 @@ PageAdmin.menu.top.configuration.expressionEvaluator=Expression evaluator
PageAdmin.menu.top.configuration.importObject=Import object
PageAdmin.menu.top.configuration.internals=Internals configuration
PageAdmin.menu.top.configuration.logging=Logging
PageAdmin.menu.top.configuration.notifications=Notifications
PageAdmin.menu.top.configuration.profiling=Profiling
PageAdmin.menu.top.configuration.repositoryObjects=Repository objects
PageAdmin.menu.top.configuration.security=Security
PageAdmin.menu.top.configuration.shadowsDetails=Shadows details
Expand Down

0 comments on commit 63cef1e

Please sign in to comment.