1 files changed, 28 insertions, 8 deletions

diff --git a/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts
index 7359ac0e91..4c3922264c 100644
--- a/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts
+++ b/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
 /**
  * Created by obarda on 1/18/2017.
  */
@@ -153,7 +173,7 @@ export class ModulePropertyView extends PropertyFormBaseView {
                 switch (this.$scope.property.name) {
 
                     case UNIQUE_GROUP_PROPERTIES_NAME.MIN_VF_MODULE_INSTANCES:
-                        if (!maxPropertyValue || maxPropertyValue === null) {
+                        if (isNaN(maxPropertyValue) || maxPropertyValue == null) {
                             isValid = propertyValue <= initialCountPropertyValue;
                         }
                         else {
@@ -161,7 +181,7 @@ export class ModulePropertyView extends PropertyFormBaseView {
                         }
                         this.$scope.forms.editForm["value"].$setValidity('maxValidation', isValid);
                         if (this.component.isService()) {
-                            if (!parentPropertyValue || parentPropertyValue === null) {
+                            if (isNaN(parentPropertyValue) || parentPropertyValue == null) {
                                 isValid = true;
                             } else {
                                 isValid = propertyValue >= parentPropertyValue;
@@ -170,14 +190,14 @@ export class ModulePropertyView extends PropertyFormBaseView {
                         }
                         break;
                     case UNIQUE_GROUP_PROPERTIES_NAME.MAX_VF_MODULE_INSTANCES:
-                        if (!minPropertyValue || minPropertyValue === null) {
+                        if (isNaN(minPropertyValue) || minPropertyValue == null) {
                             isValid = propertyValue >= initialCountPropertyValue;
                         } else {
-                            isValid = !propertyValue || (propertyValue >= minPropertyValue && propertyValue >= initialCountPropertyValue);
+                            isValid = isNaN(propertyValue) || (propertyValue >= minPropertyValue && propertyValue >= initialCountPropertyValue);
                         }
                         this.$scope.forms.editForm["value"].$setValidity('minValidation', isValid);
                         if (this.component.isService()) {
-                            if (!parentPropertyValue || parentPropertyValue === null) {
+                            if (isNaN(parentPropertyValue) || parentPropertyValue == null) {
                                 isValid = true;
                             }
                             else {
@@ -187,11 +207,11 @@ export class ModulePropertyView extends PropertyFormBaseView {
                         }
                         break;
                     case UNIQUE_GROUP_PROPERTIES_NAME.INITIAL_COUNT:
-                        if ((!minPropertyValue || minPropertyValue === null) && (!maxPropertyValue || maxPropertyValue === null)) {
+                        if ((isNaN(minPropertyValue) || minPropertyValue == null) && (isNaN(maxPropertyValue) || maxPropertyValue == null)) {
                             isValid = true;
-                        } else if (!minPropertyValue || minPropertyValue === null) {
+                        } else if (isNaN(minPropertyValue) || minPropertyValue == null) {
                             isValid = propertyValue <= maxPropertyValue;
-                        } else if (!maxPropertyValue || maxPropertyValue === null) {
+                        } else if (isNaN(maxPropertyValue) || maxPropertyValue == null) {
                             isValid = propertyValue >= minPropertyValue;
                         } else {
                             isValid = minPropertyValue <= propertyValue && propertyValue <= maxPropertyValue;