changed the password confirmation form field in the web installer so that it doesn't clobber some env vars, and allowed admin username and email to be set via env var

This commit is contained in:
Julian Lam
2015-04-25 22:34:54 -04:00
parent 5a6c46a0a0
commit 84cbdc1358
2 changed files with 4 additions and 4 deletions

View File

@@ -370,8 +370,8 @@ function createAdmin(callback) {
} }
var results = { var results = {
username: install.values['admin:username'] || 'admin', username: install.values['admin:username'] || nconf.get('admin:username') || 'admin',
email: install.values['admin:email'] || '', email: install.values['admin:email'] || nconf.get('admin:email') || '',
password: install.values['admin:password'] || nconf.get('admin:password') || password, password: install.values['admin:password'] || nconf.get('admin:password') || password,
'password:confirm': install.values['admin:password:confirm'] || nconf.get('admin:password') || password 'password:confirm': install.values['admin:password:confirm'] || nconf.get('admin:password') || password
}; };

View File

@@ -78,8 +78,8 @@
</div> </div>
<div class="row input-row"> <div class="row input-row">
<div class="col-sm-7 col-xs-12 input-field"> <div class="col-sm-7 col-xs-12 input-field">
<label for="admin:password:confirm">Confirm Password</label> <label for="admin:passwordConfirm">Confirm Password</label>
<input type="password" class="form-control" name="admin:password:confirm" value="<!-- IF admin:password:confirm -->{admin:password:confirm}<!-- ENDIF admin:password:confirm -->" placeholder="Confirm Password" /> <input type="password" class="form-control" name="admin:passwordConfirm" value="<!-- IF admin:passwordConfirm -->{admin:passwordConfirm}<!-- ENDIF admin:passwordConfirm -->" placeholder="Confirm Password" />
</div> </div>
<div class="col-sm-5 help-text" data-help="Please confirm your password."></div> <div class="col-sm-5 help-text" data-help="Please confirm your password."></div>
</div> </div>