Skip to content

CAT-2648/CAT-2649 Fixed #1162

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
Jan 20, 2017
Merged

CAT-2648/CAT-2649 Fixed #1162

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
ce19fb8
CAT-2648/CAT-2649 Fixed
Durgesh1988 Jan 20, 2017
ce71c07
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 20, 2017
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
9 changes: 8 additions & 1 deletion client/cat3/src/partials/sections/dashboard/bots/controller/botChefLogCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,14 @@
});
};
chefLogData.createInstanceList = function (historyItem) {
var nodeIds =historyItem.nodeIds ? historyItem.nodeIds : historyItem.auditTrailConfig.nodeIds ;
var nodeIds = [];
if(historyItem.nodeIds){
nodeIds = historyItem.nodeIds;
}else{
for(var i = 0; i < historyItem.auditTrailConfig.nodeIdsWithActionLog.length;i++){
nodeIds.push(historyItem.auditTrailConfig.nodeIdsWithActionLog[i].nodeId);
}
}
var nodeIdWithActionLogs = [];
var requestObj = {
"instanceIds": nodeIds
Expand Down
6 changes: 5 additions & 1 deletion client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
angular.module('library.bots',[])
.controller('botLogsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
$scope.botName = items.auditTrailConfig.name;
$scope.nodeIds = items.auditTrailConfig.nodeIds;
//$scope.nodeIds = items.auditTrailConfig.nodeIds;
$scope.nodeIds = [];
for(var i = 0; i < items.auditTrailConfig.nodeIdsWithActionLog.length;i++){
$scope.nodeIds.push(items.auditTrailConfig.nodeIdsWithActionLog[i].nodeId);
}
$scope.taskType = items.auditTrailConfig.executionType;
$scope.nodeIdsWithActionLog = items.auditTrailConfig.nodeIdsWithActionLog;
$scope.isBotLogsLoading = true;
Expand Down
4 changes: 4 additions & 0 deletions ...pp/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,10 @@ CloudFormationBlueprintSchema.methods.launch = function (launchParams, callback)
}
});
if (nodeIdWithActionLogId.length === instances.length && launchParams.auditTrailId !== null) {
var nodeIds = [];
for(var i = 0; i < nodeIdWithActionLogId.length;i++){
nodeIds.push(nodeIdWithActionLogId[i].nodeId);
}
var resultTaskExecution = {
"actionLogId": logsReferenceIds[1],
"auditTrailConfig.nodeIdsWithActionLog": nodeIdWithActionLogId,
Expand Down
8 changes: 4 additions & 4 deletions server/app/services/settingsService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
}
if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps
&& settingWizards.currentStep.name === 'Gallery Setup'
&& settingWizards.nestedSteps[1].isCompleted === false) {
settingWizards.nestedSteps[0].isCompleted = false;
&& settingWizards.currentStep.nestedSteps[1].isCompleted === false) {
settingWizards.currentStep.nestedSteps[0].isCompleted = false;
settingWizard.updateSettingWizard(settingWizards, function (err, data) {
if (err) {
callback(err,null);
Expand All @@ -356,8 +356,8 @@ settingsService.trackSettingWizard = function trackSettingWizard(id,orgId,callba
}
if (settingWizards !== null && settingWizards.currentStep && settingWizards.currentStep.nestedSteps
&& settingWizards.currentStep.name === 'Gallery Setup'
&& settingWizards.nestedSteps[2].isCompleted === false) {
settingWizards.nestedSteps[1].isCompleted = false;
&& settingWizards.currentStep.nestedSteps[2].isCompleted === false) {
settingWizards.currentStep.nestedSteps[1].isCompleted = false;
settingWizard.updateSettingWizard(settingWizards, function (err, data) {
if (err) {
callback(err,null);
Expand Down