Skip to content

CAT-2327 Implementation #711

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 1 commit into from
Sep 14, 2016
Merged

CAT-2327 Implementation #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 44 additions & 11 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 @@ -1938,9 +1938,19 @@ <h4 class="modal-title">Importing Instances</h4>
var bgTagName = $(this).find('.bgTagName').val();
updateUniqueInstanceTagsObj["id"] = instanceId;
updateUniqueInstanceTagsObj["tags"] = {};
updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
if(projectTagName === '' && envTagName === '' && bgTagName ===''){
bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags");
return false;
}
if(projectTagName !== ''){
updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
}
if(envTagName !== ''){
updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
}
if(bgTagName !== ''){
updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
}
updateInstanceTagsArr.push(updateUniqueInstanceTagsObj);
});
updateInstanceTagsObj["instances"] = updateInstanceTagsArr;
Expand All @@ -1964,6 +1974,7 @@ <h4 class="modal-title">Importing Instances</h4>
});
}else{
bootbox.alert("Please select corresponding check-box for updating tags");
return false;
}
});

Expand All @@ -1983,11 +1994,21 @@ <h4 class="modal-title">Importing Instances</h4>
var projectTagName = $(this).find('.projectTagName').val();
var envTagName = $(this).find('.envTagName').val();
var bgTagName = $(this).find('.bgTagName').val();
updateUniqueBucketTagsObj["id"] = instanceId;
updateUniqueBucketTagsObj["id"] = resourceId;
updateUniqueBucketTagsObj["tags"] = {};
updateUniqueBucketTagsObj["tags"][projectTagsMapName] = projectTagName;
updateUniqueBucketTagsObj["tags"][envTagsMapName] = envTagName;
updateUniqueBucketTagsObj["tags"][bgTagsMapName] = bgTagName;
if(projectTagName === '' && envTagName === '' && bgTagName ===''){
bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags");
return false;
}
if(projectTagName !== ''){
updateUniqueBucketTagsObj["tags"][projectTagsMapName] = projectTagName;
}
if(envTagName !== ''){
updateUniqueBucketTagsObj["tags"][envTagsMapName] = envTagName;
}
if(bgTagName !== ''){
updateUniqueBucketTagsObj["tags"][bgTagsMapName] = bgTagName;
}
updateBucketTagsArr.push(updateUniqueBucketTagsObj);
});
updateBucketTagsObj["resources"] = updateBucketTagsArr;
Expand All @@ -2009,6 +2030,7 @@ <h4 class="modal-title">Importing Instances</h4>
});
}else{
bootbox.alert("Please select corresponding check-box for updating tags");
return false;
}
});

Expand All @@ -2028,11 +2050,21 @@ <h4 class="modal-title">Importing Instances</h4>
var projectTagName = $(this).find('.projectTagName').val();
var envTagName = $(this).find('.envTagName').val();
var bgTagName = $(this).find('.bgTagName').val();
updateUniqueDBTagsObj["id"] = instanceId;
updateUniqueDBTagsObj["id"] = resourceId;
updateUniqueDBTagsObj["tags"] = {};
updateUniqueDBTagsObj["tags"][projectTagsMapName] = projectTagName;
updateUniqueDBTagsObj["tags"][envTagsMapName] = envTagName;
updateUniqueDBTagsObj["tags"][bgTagsMapName] = bgTagName;
if(projectTagName === '' && envTagName === '' && bgTagName ===''){
bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags");
return false;
}
if(projectTagName !== ''){
updateUniqueDBTagsObj["tags"][projectTagsMapName] = projectTagName;
}
if(envTagName !== ''){
updateUniqueDBTagsObj["tags"][envTagsMapName] = envTagName;
}
if(bgTagName !== ''){
updateUniqueDBTagsObj["tags"][bgTagsMapName] = bgTagName;
}
updateDBTagsArr.push(updateUniqueDBTagsObj);
});
updateDBTagsObj["resources"] = updateDBTagsArr;
Expand All @@ -2055,6 +2087,7 @@ <h4 class="modal-title">Importing Instances</h4>
});
}else{
bootbox.alert("Please select corresponding check-box for updating tags");
return false;
}

});
Expand Down
17 changes: 14 additions & 3 deletions client/htmls/public/js/awsCapacity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,19 @@ $(document).ready(function() {
}
updateUniqueInstanceTagsObj["id"] = instanceId;
updateUniqueInstanceTagsObj["tags"] = {};
updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
if(projectTagName === '' && envTagName === '' && bgTagName ===''){
toastr.error("Please update tag value in any text-box corresponding to selected check-box for updating tags");
return false;
}
if(projectTagName !== ''){
updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
}
if(envTagName !== ''){
updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
}
if(bgTagName !== ''){
updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
}
updateInstanceTagsArr.push(updateUniqueInstanceTagsObj);
updateInstanceTagsObj["instances"] = updateInstanceTagsArr;
$.ajax({
Expand Down Expand Up @@ -497,6 +507,7 @@ $(document).ready(function() {
});
} else {
toastr.error("Please select corresponding check-box for updating tags");
return false;
}
});
});
5 changes: 1 addition & 4 deletions server/app/routes/v1.0/routes_d4dMasters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2343,7 +2343,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
"orgname": bodyJson['orgname'],
"domainname": bodyJson['domainname'],
"rowid": bodyJson['rowid'],
"plannedCost":bodyJson['plannedCost'].toFixed(2),
"plannedCost":bodyJson['plannedCost'],
"id": "1"
}
var orgObj = new d4dModelNew.d4dModelMastersOrg(orgData);
Expand Down Expand Up @@ -2740,9 +2740,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
var currowid = bodyJson["rowid"];
delete rowtoedit._id; //fixing the issue of
logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
if(rowtoedit.plannedCost){
rowtoedit.plannedCost =rowtoedit.plannedCost.toFixed(2);
}
eval('d4dModelNew.' + dbtype).update({
rowid: bodyJson["rowid"]
}, {
Expand Down
2 changes: 2 additions & 0 deletions server/app/routes/v1.0/routes_provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2151,6 +2151,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
// TODO Use async to reduce callbacks
app.post('/aws/providers', function(req, res) {
logger.debug("Enter post() for /providers.", typeof req.body.fileName);
logger.debug("Req Body for providers ", JSON.stringify(req.body));
var user = req.session.user;
var category = configmgmtDao.getCategoryFromID("9");
var permissionto = 'create';
Expand Down Expand Up @@ -2442,6 +2443,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
// Update a particular AWS Provider
app.post('/aws/providers/:providerId/update', function(req, res) {
logger.debug("Enter post() for /providers/%s/update", req.params.providerId);
logger.debug("Req Body for providers ", JSON.stringify(req.body));
var user = req.session.user;
var category = configmgmtDao.getCategoryFromID("9");
var permissionto = 'modify';
Expand Down