Merge branch 'master' of github.com:Netflix/lemur into add-remove-certs-for-notification

This commit is contained in:
Jasmine Schladen 2021-02-18 15:16:34 -08:00
commit cbbbe22bb1
2 changed files with 7 additions and 1 deletions

View File

@ -49,6 +49,7 @@ angular.module('lemur')
}); });
}); });
NotificationService.getCertificates(notification); NotificationService.getCertificates(notification);
$scope.page = 1;
}); });
$scope.save = function (notification) { $scope.save = function (notification) {
@ -76,5 +77,10 @@ angular.module('lemur')
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
}; };
$scope.loadMoreCertificates = function () {
$scope.page++;
NotificationService.loadMoreCertificates($scope.notification, $scope.page);
};
$scope.certificateService = CertificateService; $scope.certificateService = CertificateService;
}); });

View File

@ -62,7 +62,7 @@ angular.module('lemur')
NotificationService.loadMoreCertificates = function (notification, page) { NotificationService.loadMoreCertificates = function (notification, page) {
notification.getList('certificates', {page: page, showExpired: 0}).then(function (certificates) { notification.getList('certificates', {page: page, showExpired: 0}).then(function (certificates) {
_.each(certificates, function (certificate) { _.each(certificates, function (certificate) {
notification.roles.push(certificate); notification.certificates.push(certificate);
}); });
}); });
}; };