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

Merge pull request #150 from kevgliss/121-validation 

121 validation
This commit is contained in:
kevgliss 2015-11-23 16:48:40 -08:00
parent 2525d369d4 2c88e4e3ba
commit ce1fe9321c
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -17,7 +17,7 @@ Lemur
:target: https://travis-ci.org/Netflix/lemur
.. image:: https://requires.io/github/kevgliss/lemur/requirements.svg?branch=master
:target: https://requires.io/github/kevgliss/lemur/requirements/?branch=master
:target: https://requires.io/github/Netflix/lemur/requirements/?branch=master
:alt: Requirements Status
.. image:: https://badge.waffle.io/Netflix/lemur.png?label=ready&title=Ready

2
docs/requirements.txt
View File

@ -14,7 +14,7 @@ Flask-Principal==0.4.0
Flask-Mail==0.9.1
SQLAlchemy-Utils==0.31.3
BeautifulSoup4
requests==2.8.0
requests==2.8.1
psycopg2==2.6.1
arrow==0.7.0
boto==2.38.0 # we might make this optional

4
lemur/static/app/angular/authorities/view/view.tpl.html
View File

@ -34,11 +34,9 @@
</a>
</div>
</td>
<td data-title="''">
<a ui-sref="authority({name: authority.name})">Permalink</a>
</td>
<td data-title="''">
<div class="btn-group-vertical pull-right">
<a class="btn btn-sm btn-default" ui-sref="authority({name: authority.name})">Permalink</a>
<button tooltip="Edit Authority" ng-click="edit(authority.id)" class="btn btn-sm btn-info">
Edit
</button>

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

@ -29,7 +29,7 @@
<div class="input-group col-sm-12">
<input name="selectedAuthority" tooltip="If you are unsure which authority you need; you most likely want to use 'verisign'" type="text" ng-model="certificate.selectedAuthority" placeholder="Authority Name" typeahead-on-select="certificate.attachAuthority($item)"
typeahead="authority.name for authority in authorityService.findActiveAuthorityByName($viewValue)" typeahead-loading="loadingAuthorities"
class="form-control" typeahead-wait-ms="100" typeahead-template-url="angular/authorities/authority/select.tpl.html" required>
class="form-control" typeahead-wait-ms="1000" typeahead-template-url="angular/authorities/authority/select.tpl.html" required>
</div>
</div>
</div>

10
lemur/static/app/angular/certificates/services.js vendored
View File

@ -89,7 +89,7 @@ angular.module('lemur')
});
return LemurRestangular.all('certificates');
})
.service('CertificateService', function ($location, CertificateApi, LemurRestangular, DefaultService) {
.service('CertificateService', function ($location, CertificateApi, AuthorityService, LemurRestangular, DefaultService) {
var CertificateService = this;
CertificateService.findCertificatesByName = function (filterValue) {
return CertificateApi.getList({'filter[name]': filterValue})
@ -100,6 +100,14 @@ angular.module('lemur')
CertificateService.create = function (certificate) {
certificate.attachSubAltName();
// Help users who may have just typed in their authority
if (!certificate.authority) {
AuthorityService.findActiveAuthorityByName(certificate.selectedAuthority).then(function (authorities) {
if (authorities.length > 0) {
certificate.authority = authorities[0];
}
});
}
return CertificateApi.post(certificate);
};

2
lemur/static/app/angular/wizard.html
View File

@ -5,7 +5,7 @@
<div class="modal-footer">
<input ng-hide="currentStepNumber() == 1" class="btn btn-default pull-left" type="submit" wz-previous value="Previous" />
<input ng-show="currentStepNumber() != steps.length" class="btn btn-default pull-right" type="submit" wz-next value="Next" />
<input ng-show="!context.loading" class="btn btn-success pull-right" type="submit" wz-finish value="Create" />
<input ng-show="!context.loading" ng-class="{disabled: trackingForm.invalid}" class="btn btn-success pull-right" type="submit" wz-finish value="Create" />
<button ng-show="context.loading" class="btn btn-success pull-right disabled"><wave-spinner></wave-spinner></button>
<div class="clearfix"></div>
</div>