Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Merge pull request #5306 from acburdine/remove-email

Browse source 
Removes "email" from settings
This commit is contained in:
Hannah Wolfe 2015-06-02 09:44:21 +01:00
commit 9d10e76fec
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ghost/admin/app/models/setting.js
View file

@ -6,7 +6,6 @@ var Setting = DS.Model.extend(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'),

5
ghost/admin/app/templates/settings/general.hbs
View file

@ -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>

5
ghost/admin/app/validators/setting.js
View file

@ -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'});
} }