Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2818 from Netflix/revert-2807-FasterPermalink 

Revert "Faster permalink"
This commit is contained in:
Hossein Shafagh 2019-06-26 10:44:44 -07:00 committed by GitHub
parent 14d32368c0 0e037973b2
commit ff3016e65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lemur/static/app/angular/certificates/view/view.js vendored
View File

@ -17,7 +17,7 @@ angular.module('lemur')
}); });
}) })
.controller('CertificatesViewController', function ($q, $scope, $uibModal, $stateParams, $location, CertificateApi, CertificateService, MomentService, ngTableParams, toaster) { .controller('CertificatesViewController', function ($q, $scope, $uibModal, $stateParams, CertificateApi, CertificateService, MomentService, ngTableParams, toaster) {
$scope.filter = $stateParams; $scope.filter = $stateParams;
$scope.expiredText = ['Show Expired', 'Hide Expired']; $scope.expiredText = ['Show Expired', 'Hide Expired'];
$scope.expiredValue = 0; $scope.expiredValue = 0;
@ -32,24 +32,11 @@ angular.module('lemur')
}, { }, {
total: 0, // length of data total: 0, // length of data
getData: function ($defer, params) { getData: function ($defer, params) {
$scope.path = $location.path(); CertificateApi.getList(params.url())
// Handle Permalink clicks through a separate API .then(function (data) {
// Clicking on Permalink adds the certificate name to the URL after "certificates/", which is used to identify the click params.total(data.total);
if ($scope.path.indexOf('certificates/') > -1 && $scope.path.split('/')[2].length > 0) { $defer.resolve(data);
$scope.certificateName = $scope.path.split('/')[2]; });
CertificateApi.one('name').one($scope.certificateName).getList()
.then(function (data) {
params.total(data.total);
$defer.resolve(data);
});
}
else {
CertificateApi.getList(params.url())
.then(function (data) {
params.total(data.total);
$defer.resolve(data);
});
}
} }
}); });