Skip to content

Resolved issue with blueprint logs. #1187

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
Feb 2, 2017
Merged

Resolved issue with blueprint logs. #1187

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
48 changes: 26 additions & 22 deletions client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
}]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices',
function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs){
}]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', 'toastr',
function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs, toastr){
//UI Grid for chef Task starts
$scope.botHistory = items;
$scope.botId = items.botId;
Expand Down Expand Up @@ -802,27 +802,31 @@
}

$scope.historyLogs=function(hist) {
var modalInstance = $modal.open({
animation: true,
templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html',
controller: 'botExecutionLogsCtrl as botExecLogCtrl',
backdrop : 'static',
keyboard: false,
resolve: {
items: function() {
return {
taskId : hist.auditId,
historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0] && hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId,
taskType:hist.auditTrailConfig.executionType
};
if(hist.auditHistoryId || (hist.auditTrailConfig.nodeIdsWithActionLog[0] && hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId)) {
var modalInstance = $modal.open({
animation: true,
templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html',
controller: 'botExecutionLogsCtrl as botExecLogCtrl',
backdrop : 'static',
keyboard: false,
resolve: {
items: function() {
return {
taskId : hist.auditId,
historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0] && hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId,
taskType:hist.auditTrailConfig.executionType
};
}
}
}
});
modalInstance.result.then(function(selectedItem) {
$scope.selected = selectedItem;
}, function() {
console.log('Modal Dismissed at ' + new Date());
});
});
modalInstance.result.then(function(selectedItem) {
$scope.selected = selectedItem;
}, function() {
console.log('Modal Dismissed at ' + new Date());
});
} else {
toastr.error("Logs are getting generated. Please wait");
}
}

$scope.cancel= function() {
Expand Down