lockout panel is returned back

Evolveum · Jul 26, 2017 · d9fb8d4 · d9fb8d4
1 parent 9ab0013
commit d9fb8d4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2010-2017 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.evolveum.midpoint.web.component;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -432,9 +432,11 @@ private Panel createTypedInputComponent(String id) {
 
 //              if (ActivationType.F_ADMINISTRATIVE_STATUS.equals(definition.getName())) {
 //                  return WebComponentUtil.createEnumPanel(ActivationStatusType.class, id, new PropertyModel<ActivationStatusType>(valueWrapperModel, baseExpression), this);
-//              } else if(ActivationType.F_LOCKOUT_STATUS.equals(definition.getName())){
-//                  return new LockoutStatusPanel(id, valueWrapperModel.getObject(), new PropertyModel<LockoutStatusType>(valueWrapperModel, baseExpression));
-//              } else {
+//              } else
+                if(ActivationType.F_LOCKOUT_STATUS.equals(definition.getName())){
+                  return new LockoutStatusPanel(id, valueWrapperModel.getObject(), new PropertyModel<LockoutStatusType>(valueWrapperModel, baseExpression));
+                }
+//              else {
 //                  if (definition.getTypeName().getLocalPart().equals(ActivationStatusType.class.getSimpleName())) {
 //                      return WebComponentUtil.createEnumPanel(ActivationStatusType.class, id, new PropertyModel<ActivationStatusType>(valueWrapperModel, baseExpression), this);
 //                  }