MID-3830 - Removing global password policy from system conf panel

Evolveum · Nov 8, 2017 · 2a1edad · 2a1edad
1 parent 87113b1
commit 2a1edad
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 14 deletions.
diff --git a/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html b/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
@@ -23,13 +23,6 @@ <h3 style="margin-left: 20px;">
                 <wicket:message key="SystemConfigPanel.title.basic"/>
             </h3>
 
-            <div class="form-group">
-                <label class="col-md-4 control-label">
-                    <wicket:message key="SystemConfigPanel.title.passwordPolicy"/>
-                </label>
-                <div wicket:id="passwordPolicyChooser"/>
-            </div>
-
             <div class="form-group">
                 <label class="col-md-4 control-label">
                     <wicket:message key="SystemConfigPanel.title.securityPolicy"/>

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java b/.../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
@@ -45,7 +45,6 @@
 public class SystemConfigPanel extends BasePanel<SystemConfigurationDto> {
 
     private static final long serialVersionUID = 1L;
-    private static final String ID_GLOBAL_PASSWORD_POLICY_CHOOSER = "passwordPolicyChooser";
     private static final String ID_GLOBAL_SECURITY_POLICY_CHOOSER = "securityPolicyChooser";
     private static final String ID_OBJECT_POLICY_EDITOR = "objectPolicyEditor";
     private static final String ID_GLOBAL_CHOOSEASSIGNEMNTPOLICYENFORCEMENT = "chooseAssignmentPolicyEnforcement";
@@ -79,13 +78,9 @@ public SystemConfigPanel(String id, IModel<SystemConfigurationDto> model) {
     }
 
     protected void initLayout() {
-
-        ChooseTypePanel<ValuePolicyType> passPolicyChoosePanel = new ChooseTypePanel<ValuePolicyType>(ID_GLOBAL_PASSWORD_POLICY_CHOOSER,
-                new PropertyModel<ObjectViewDto<ValuePolicyType>>(getModel(), SystemConfigurationDto.F_PASSWORD_POLICY));
-
         ChooseTypePanel<SecurityPolicyType> securityPolicyChoosePanel = new ChooseTypePanel<SecurityPolicyType>(ID_GLOBAL_SECURITY_POLICY_CHOOSER,
                 new PropertyModel<ObjectViewDto<SecurityPolicyType>>(getModel(), SystemConfigurationDto.F_SECURITY_POLICY));
-        add(passPolicyChoosePanel);
+
         add(securityPolicyChoosePanel);
 
         ObjectPolicyConfigurationEditor objectPolicyEditor = new ObjectPolicyConfigurationEditor(ID_OBJECT_POLICY_EDITOR,

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -2895,7 +2895,6 @@ SystemConfigPanel.title.misc=Miscellaneous
 SystemConfigPanel.title.deploymentInformation = Deployment information
 SystemConfigPanel.title.modelHooks=Model hooks
 SystemConfigPanel.title.notification=Notifications
-SystemConfigPanel.title.passwordPolicy=Global password policy
 SystemConfigPanel.title.securityPolicy=Global security policy
 SystemConfigPanel.title.userTemplate=Default user template
 SystemConfigPanel.tooltip.duration=Format: P[n][p], n-number, p-period (d - days, m - months, ...), P3M - cleanup every 3 months