Default authority. (#549)
* Enabling the specification of a default authority, if no default is found then the first available authority is selected * PEP8 * Skipping tests relying on keytool
This commit is contained in:
@ -113,7 +113,7 @@ angular.module('lemur')
|
||||
});
|
||||
return LemurRestangular.all('certificates');
|
||||
})
|
||||
.service('CertificateService', function ($location, CertificateApi, AuthorityService, LemurRestangular, DefaultService) {
|
||||
.service('CertificateService', function ($location, CertificateApi, AuthorityService, AuthorityApi, LemurRestangular, DefaultService) {
|
||||
var CertificateService = this;
|
||||
CertificateService.findCertificatesByName = function (filterValue) {
|
||||
return CertificateApi.getList({'filter[name]': filterValue})
|
||||
@ -196,6 +196,17 @@ angular.module('lemur')
|
||||
if (!certificate.organizationalUnit) {
|
||||
certificate.organizationalUnit = defaults.organizationalUnit;
|
||||
}
|
||||
|
||||
if (!certificate.authority) {
|
||||
if (!defaults.authority) {
|
||||
// set the default authority
|
||||
AuthorityApi.getList().then(function(authorities) {
|
||||
certificate.authority = authorities[0];
|
||||
});
|
||||
} else {
|
||||
certificate.authority = defaults.authority;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user