Skip to content

CAT-2332/CAT-2341 fixed #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2016
Merged

CAT-2332/CAT-2341 fixed #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf400eb
CAT-2332/CAT-2341 fixed
Durgesh1988 Sep 16, 2016
2fadd6f
CAT-2332/CAT-2341 fixed
Durgesh1988 Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions client/htmls/private/ajax/Settings/providerSync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -1107,9 +1107,9 @@ <h4 class="modal-title">Importing Instances</h4>
}
}
}
}else{
}/*else{
$('.btnprojectMappingSave').attr('disabled',true);
}
}*/
//For environment catalystEntityType
if(objcatalystEntityType == catalystEntityEnvName){
$envtagsList.val(objtagName);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1283,7 +1283,7 @@ <h4 class="modal-title">Importing Instances</h4>
}
}
}).fail(function(jxhr) {
$('.btnenvMappingSave').attr('disabled',true);
// $('.btnenvMappingSave').attr('disabled',true);
});
}

Expand All @@ -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
Expand Down Expand Up @@ -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(){
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions client/htmls/public/js/awsCapacity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down