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

Fixes (#329)

Browse Source 
* Modifying the way roles are assigned.

* Adding migration scripts.

* Adding endpoints field for future use.

* Fixing dropdowns.
This commit is contained in:
kevgliss
2016-05-23 18:38:04 -07:00
parent 656269ff17
commit 1ca38015bc
13 changed files with 63 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lemur/static/app/angular/certificates/certificate/certificate.js vendored
View File

@ -94,43 +94,12 @@ angular.module('lemur')
$uibModalInstance.dismiss('cancel');
};
$scope.authorities = [];
AuthorityApi.getList().then(function (authorities) {
angular.extend($scope.authorities, authorities);
});
$scope.authorityConfig = {
valueField: 'id',
labelField: 'name',
highlight: true,
placeholder: 'Select Authority',
maxItems: 1,
onChange: function (value) {
angular.forEach($scope.authorities, function (authority) {
if (authority.id === parseInt(value)) {
$scope.certificate.authority = authority;
}
});
},
render: {
option: function(item) {
return '<div><dl>' +
'<dt>' +
'<span>' + item.name + ' <small>' + item.owner + '</small></span>' +
'</dt>' +
'<dd>' +
'<span>' + item.description + '</span>' +
'</dd>' +
'</dl></div>';
}
},
load: function (value) {
AuthorityService.findAuthorityByName(value).then(function (authorities) {
$scope.authorities = authorities;
});
}
$scope.getAuthoritiesByName = function (value) {
return AuthorityService.findAuthorityByName(value).then(function (authorities) {
$scope.authorities = authorities;
});
};
$scope.dateOptions = {
formatYear: 'yy',
maxDate: new Date(2020, 5, 22),

13
lemur/static/app/angular/certificates/certificate/tracking.tpl.html
View File

@ -46,8 +46,17 @@
Certificate Authority
</label>
<div class="col-sm-10">
<selectize name="selectedAuthority" placeholder="Select an Authority..." options="authorities" config="authorityConfig"
ng-model="certificate.selectedAuthority" required="true"></selectize>
<ui-select class="input-md" ng-model="certificate.authority" theme="bootstrap" title="choose an authority">
<ui-select-match placeholder="select an authority...">{{$select.selected.name}}</ui-select-match>
<ui-select-choices class="form-control" repeat="authority in authorities"
refresh="getauthoritiesbyname($select.search)"
refresh-delay="300">
<div ng-bind-html="authority.name | highlight: $select.search"></div>
<small>
<span ng-bind-html="''+authority.description | highlight: $select.search"></span>
</small>
</ui-select-choices>
</ui-select>
</div>
</div>
<div class="form-group">