From bf400eb9ed67149caa774786bea08f6df03fcc59 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 16 Sep 2016 18:07:28 +0530
Subject: [PATCH 1/2] CAT-2332/CAT-2341 fixed

---
 .../private/ajax/Settings/providerSync.html   | 34 +++++++++----------
 client/htmls/public/js/awsCapacity.js         | 18 +++++-----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html
index fd25800de..145a830a4 100644
--- a/client/htmls/private/ajax/Settings/providerSync.html
+++ b/client/htmls/private/ajax/Settings/providerSync.html
@@ -783,10 +783,10 @@ <h4 class="modal-title">Importing Instances</h4>
                 {"data": "instanceIP","orderable" : true,
                     "render":function(data, type, full, meta) {
                         if(full.instanceIP === null){
-                            if(full.privateIpAddress === null){
-                                return '-';
-                            }else{
+                            if(full.privateIpAddress &&  full.privateIpAddress !== null){
                                 return full.privateIpAddress;
+                            }else{
+                                return '-';
                             }
                         }else{
                             return full.instanceIP;
@@ -1055,11 +1055,11 @@ <h4 class="modal-title">Importing Instances</h4>
                     var catalystEntityProjName = $('#projectnameLabelId').attr('catalystEntitytype');
                     var catalystEntityEnvName = $('#envnameLabelId').attr('catalystEntitytype');
                     var catalystEntityBgName = $('#bgNameLabelId').attr('catalystEntitytype');
-                    if(tagsListSelected.length > 0){
+                    /*if(tagsListSelected.length > 0){
                         $('.btnprojectMappingSave').attr('disabled',false);
                     }else{
                         $('.btnprojectMappingSave').attr('disabled',true);
-                    }
+                    }*/
 
                     for(var i=0;i<tagsListSelected.length;i++){
                         var objcatalystEntityType = tagsListSelected[i].catalystEntityType;
@@ -1071,7 +1071,7 @@ <h4 class="modal-title">Importing Instances</h4>
                             $bgtagsList.val(objtagName);
                         }
                         if(objcatalystEntityType == catalystEntityProjName){
-                            $('.btnprojectMappingSave').attr('disabled',false);
+                            //$('.btnprojectMappingSave').attr('disabled',false);
                             $projecttagsList.val(objtagName);
                             //For Mapping tab.....
                             //For project catalystEntityType
@@ -1108,7 +1108,7 @@ <h4 class="modal-title">Importing Instances</h4>
                                 }
                             }
                         }else{
-                            $('.btnprojectMappingSave').attr('disabled',true);
+                            //$('.btnprojectMappingSave').attr('disabled',true);
                         }
                         //For environment catalystEntityType
                         if(objcatalystEntityType == catalystEntityEnvName){
@@ -1250,7 +1250,7 @@ <h4 class="modal-title">Importing Instances</h4>
 
             $.get('/providers/'+urlproviderId+'/tag-mappings/environment', function(data) {
                 if(data){
-                    $('.btnenvMappingSave').attr('disabled',false);
+                   // $('.btnenvMappingSave').attr('disabled',false);
                     var $tbody = $('#mappingenvTable tbody').empty();
                     for(var i = 0; i < envList.length; i++){
                         //For Table
@@ -1283,7 +1283,7 @@ <h4 class="modal-title">Importing Instances</h4>
                     }
                 }
             }).fail(function(jxhr) {
-                $('.btnenvMappingSave').attr('disabled',true);
+               // $('.btnenvMappingSave').attr('disabled',true);
             });
         }
 
@@ -1292,7 +1292,7 @@ <h4 class="modal-title">Importing Instances</h4>
 
             $.get('/providers/'+urlproviderId+'/tag-mappings/bgName', function(data) {
                 if(data){
-                    $('.btnbgMappingSave').attr('disabled',false);
+                    ///$('.btnbgMappingSave').attr('disabled',false);
                     var $tbody = $('#mappingBgTable tbody').empty();
                     for(var i = 0; i < bgList.length; i++){
                         //For Table
@@ -1325,7 +1325,7 @@ <h4 class="modal-title">Importing Instances</h4>
                     }
                 }
             }).fail(function(jxhr) {
-                $('.btnbgMappingSave').attr('disabled',true);
+               /// $('.btnbgMappingSave').attr('disabled',true);
             });
         }
         $('.btnbgMappingSave').on('click',function(){
@@ -1767,10 +1767,10 @@ <h4 class="modal-title">Importing Instances</h4>
                     {"data": "","orderable" : true,
                         "render":function(data, type, full, meta) {
                             if(full.ip === null){
-                                if(full.privateIpAddress === null){
-                                    return '-';
-                                }else{
+                                if(full.privateIpAddress &&  full.privateIpAddress !== null){
                                     return full.privateIpAddress;
+                                }else{
+                                    return '-';
                                 }
                             }else{
                                 return full.ip;
@@ -1944,10 +1944,10 @@ <h4 class="modal-title">Importing Instances</h4>
                     {"data": "","orderable" : true,
                         "render":function(data, type, full, meta) {
                             if(full.ip === null){
-                                if(full.privateIpAddress === null){
-                                    return '-';
-                                }else{
+                                if(full.privateIpAddress &&  full.privateIpAddress !== null){
                                     return full.privateIpAddress;
+                                }else{
+                                    return '-';
                                 }
                             }else{
                                 return full.ip;
diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js
index 1a78e9422..4397b0852 100644
--- a/client/htmls/public/js/awsCapacity.js
+++ b/client/htmls/public/js/awsCapacity.js
@@ -268,10 +268,10 @@ $(document).ready(function() {
                 "orderable": true,
                     "render":function(data, type, full, meta) {
                         if(full.instanceIP === null){
-                            if(full.privateIpAddress === null){
-                                return '-';
-                            }else{
+                            if(full.privateIpAddress &&  full.privateIpAddress !== null){
                                 return full.privateIpAddress;
+                            }else{
+                                return '-';
                             }
                         }else{
                             return full.instanceIP;
@@ -325,10 +325,10 @@ $(document).ready(function() {
                 "orderable": true,
                 "render": function(data, type, full,meta) {
                     if(full.ip === null){
-                        if(full.privateIpAddress === null){
-                            return '-';
-                        }else{
+                        if(full.privateIpAddress &&  full.privateIpAddress !== null){
                             return full.privateIpAddress;
+                        }else{
+                            return '-';
                         }
                     }else{
                         return full.ip;
@@ -402,10 +402,10 @@ $(document).ready(function() {
                 "orderable": true,
                 "render":function(data, type, full, meta) {
                     if(full.ip === null){
-                        if(full.privateIpAddress === null){
-                            return '-';
-                        }else{
+                        if(full.privateIpAddress &&  full.privateIpAddress !== null){
                             return full.privateIpAddress;
+                        }else{
+                            return '-';
                         }
                     }else{
                         return full.ip;

From 2fadd6f1c3dbd25c7177316e632ec58b0076dcb7 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 16 Sep 2016 18:12:04 +0530
Subject: [PATCH 2/2] CAT-2332/CAT-2341 fixed

---
 client/htmls/private/ajax/Settings/providerSync.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html
index 145a830a4..4644195ef 100644
--- a/client/htmls/private/ajax/Settings/providerSync.html
+++ b/client/htmls/private/ajax/Settings/providerSync.html
@@ -1107,9 +1107,9 @@ <h4 class="modal-title">Importing Instances</h4>
                                     }
                                 }
                             }
-                        }else{
-                            //$('.btnprojectMappingSave').attr('disabled',true);
-                        }
+                        }/*else{
+                            $('.btnprojectMappingSave').attr('disabled',true);
+                        }*/
                         //For environment catalystEntityType
                         if(objcatalystEntityType == catalystEntityEnvName){
                             $envtagsList.val(objtagName);