mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-24 19:33:02 +03:00
remove settings email
closes #5299 - removes settings/general email field from both client and server side - fixes tests to reflect removal of email
This commit is contained in:
parent
4ad1c59a74
commit
b826a31799
@ -7,7 +7,6 @@ var Setting = DS.Model.extend(NProgressSaveMixin, ValidationEngine, {
|
|||||||
|
|
||||||
title: DS.attr('string'),
|
title: DS.attr('string'),
|
||||||
description: DS.attr('string'),
|
description: DS.attr('string'),
|
||||||
email: DS.attr('string'),
|
|
||||||
logo: DS.attr('string'),
|
logo: DS.attr('string'),
|
||||||
cover: DS.attr('string'),
|
cover: DS.attr('string'),
|
||||||
defaultLang: DS.attr('string'),
|
defaultLang: DS.attr('string'),
|
||||||
|
@ -47,11 +47,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<div class="form-group">
|
|
||||||
<label for="email-address">Email Address</label>
|
|
||||||
{{input id="email-address" class="gh-input" name="general[email-address]" type="email" value=model.email autocapitalize="off" autocorrect="off"}}
|
|
||||||
<p>Address to use for admin notifications</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="postsPerPage">Posts per page</label>
|
<label for="postsPerPage">Posts per page</label>
|
||||||
|
@ -4,7 +4,6 @@ var SettingValidator = Ember.Object.create({
|
|||||||
var validationErrors = [],
|
var validationErrors = [],
|
||||||
title = model.get('title'),
|
title = model.get('title'),
|
||||||
description = model.get('description'),
|
description = model.get('description'),
|
||||||
email = model.get('email'),
|
|
||||||
postsPerPage = model.get('postsPerPage'),
|
postsPerPage = model.get('postsPerPage'),
|
||||||
isPrivate = model.get('isPrivate'),
|
isPrivate = model.get('isPrivate'),
|
||||||
password = model.get('password');
|
password = model.get('password');
|
||||||
@ -17,10 +16,6 @@ var SettingValidator = Ember.Object.create({
|
|||||||
validationErrors.push({message: 'Description is too long'});
|
validationErrors.push({message: 'Description is too long'});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!validator.isEmail(email) || !validator.isLength(email, 0, 254)) {
|
|
||||||
validationErrors.push({message: 'Supply a valid email address'});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isPrivate && password === '') {
|
if (isPrivate && password === '') {
|
||||||
validationErrors.push({message: 'Password must be supplied'});
|
validationErrors.push({message: 'Password must be supplied'});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user