Merge "[SDC-235] rebase code"

1 files changed, 4 insertions, 1 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 4c3922264c..3a61371e85 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
@@ -86,7 +86,8 @@ export class ModulePropertyView extends PropertyFormBaseView {
         let property = _.find(this.selectedModule.properties, (property) => {
             return property.uniqueId === this.$scope.property.uniqueId;
         });
-        if (property.value !== this.$scope.property.value) {
+
+        if (!property.readonly && property.value !== this.$scope.property.value) {
             if (this.component.isResource()) {
                 (<Resource>this.component).updateResourceGroupProperties(this.selectedModule, [this.$scope.property]).then(onSuccess, onFailed); // for now we only update one property at a time
             }
@@ -101,6 +102,8 @@ export class ModulePropertyView extends PropertyFormBaseView {
             }
         } else {
             deferred.resolve(true);
+            this.$uibModalInstance.close();
+
         }
         return deferred.promise;
     }