mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-29 22:01:49 +03:00
Added users.comment_notifications
field
refs: https://github.com/TryGhost/Team/issues/1668 - temporary solution until `user_settings` table is in place
This commit is contained in:
parent
fa59286eff
commit
301ae61aa9
@ -31,6 +31,7 @@ const author = (attrs, frame) => {
|
|||||||
delete attrs.last_seen;
|
delete attrs.last_seen;
|
||||||
delete attrs.status;
|
delete attrs.status;
|
||||||
delete attrs.email;
|
delete attrs.email;
|
||||||
|
delete attrs.comment_notifications;
|
||||||
|
|
||||||
// @NOTE: used for night shift
|
// @NOTE: used for night shift
|
||||||
delete attrs.accessibility;
|
delete attrs.accessibility;
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
const {createAddColumnMigration} = require('../../utils');
|
||||||
|
|
||||||
|
module.exports = createAddColumnMigration('users', 'comment_notifications', {
|
||||||
|
type: 'boolean',
|
||||||
|
nullable: false,
|
||||||
|
defaultTo: true
|
||||||
|
});
|
@ -148,6 +148,7 @@ module.exports = {
|
|||||||
meta_description: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 500}}},
|
meta_description: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 500}}},
|
||||||
tour: {type: 'text', maxlength: 65535, nullable: true},
|
tour: {type: 'text', maxlength: 65535, nullable: true},
|
||||||
last_seen: {type: 'dateTime', nullable: true},
|
last_seen: {type: 'dateTime', nullable: true},
|
||||||
|
comment_notifications: {type: 'boolean', nullable: false, defaultTo: true},
|
||||||
created_at: {type: 'dateTime', nullable: false},
|
created_at: {type: 'dateTime', nullable: false},
|
||||||
created_by: {type: 'string', maxlength: 24, nullable: false},
|
created_by: {type: 'string', maxlength: 24, nullable: false},
|
||||||
updated_at: {type: 'dateTime', nullable: true},
|
updated_at: {type: 'dateTime', nullable: true},
|
||||||
|
@ -61,7 +61,8 @@ User = ghostBookshelf.Model.extend({
|
|||||||
return {
|
return {
|
||||||
password: security.identifier.uid(50),
|
password: security.identifier.uid(50),
|
||||||
visibility: 'public',
|
visibility: 'public',
|
||||||
status: 'active'
|
status: 'active',
|
||||||
|
comment_notifications: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@ exports[`Sessions API can read session now the owner is logged in 1: [body] 1`]
|
|||||||
Object {
|
Object {
|
||||||
"accessibility": null,
|
"accessibility": null,
|
||||||
"bio": "bio",
|
"bio": "bio",
|
||||||
|
"comment_notifications": true,
|
||||||
"cover_image": null,
|
"cover_image": null,
|
||||||
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
||||||
"created_by": "1",
|
"created_by": "1",
|
||||||
@ -57,7 +58,7 @@ exports[`Sessions API can read session now the owner is logged in 2: [headers] 1
|
|||||||
Object {
|
Object {
|
||||||
"access-control-allow-origin": "http://127.0.0.1:2369",
|
"access-control-allow-origin": "http://127.0.0.1:2369",
|
||||||
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
||||||
"content-length": "515",
|
"content-length": "544",
|
||||||
"content-type": "application/json; charset=utf-8",
|
"content-type": "application/json; charset=utf-8",
|
||||||
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
||||||
"vary": "Origin, Accept-Encoding",
|
"vary": "Origin, Accept-Encoding",
|
||||||
|
@ -6,6 +6,7 @@ Object {
|
|||||||
Object {
|
Object {
|
||||||
"accessibility": null,
|
"accessibility": null,
|
||||||
"bio": null,
|
"bio": null,
|
||||||
|
"comment_notifications": true,
|
||||||
"cover_image": null,
|
"cover_image": null,
|
||||||
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
||||||
"email": "test@example.com",
|
"email": "test@example.com",
|
||||||
@ -33,7 +34,7 @@ exports[`Authentication API Blog setup complete setup 2: [headers] 1`] = `
|
|||||||
Object {
|
Object {
|
||||||
"access-control-allow-origin": "http://127.0.0.1:2369",
|
"access-control-allow-origin": "http://127.0.0.1:2369",
|
||||||
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
||||||
"content-length": "434",
|
"content-length": "463",
|
||||||
"content-type": "application/json; charset=utf-8",
|
"content-type": "application/json; charset=utf-8",
|
||||||
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
||||||
"vary": "Origin, Accept-Encoding",
|
"vary": "Origin, Accept-Encoding",
|
||||||
@ -78,6 +79,7 @@ Object {
|
|||||||
Object {
|
Object {
|
||||||
"accessibility": null,
|
"accessibility": null,
|
||||||
"bio": null,
|
"bio": null,
|
||||||
|
"comment_notifications": true,
|
||||||
"cover_image": null,
|
"cover_image": null,
|
||||||
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
||||||
"email": "test@example.com",
|
"email": "test@example.com",
|
||||||
@ -105,7 +107,7 @@ exports[`Authentication API Blog setup complete setup with default theme 2: [hea
|
|||||||
Object {
|
Object {
|
||||||
"access-control-allow-origin": "http://127.0.0.1:2369",
|
"access-control-allow-origin": "http://127.0.0.1:2369",
|
||||||
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
||||||
"content-length": "434",
|
"content-length": "463",
|
||||||
"content-type": "application/json; charset=utf-8",
|
"content-type": "application/json; charset=utf-8",
|
||||||
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
||||||
"vary": "Origin, Accept-Encoding",
|
"vary": "Origin, Accept-Encoding",
|
||||||
@ -164,6 +166,7 @@ Object {
|
|||||||
Object {
|
Object {
|
||||||
"accessibility": null,
|
"accessibility": null,
|
||||||
"bio": "bio",
|
"bio": "bio",
|
||||||
|
"comment_notifications": true,
|
||||||
"cover_image": null,
|
"cover_image": null,
|
||||||
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
"created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/,
|
||||||
"email": "test-edit@example.com",
|
"email": "test-edit@example.com",
|
||||||
@ -191,7 +194,7 @@ exports[`Authentication API Blog setup update setup 2: [headers] 1`] = `
|
|||||||
Object {
|
Object {
|
||||||
"access-control-allow-origin": "http://127.0.0.1:2369",
|
"access-control-allow-origin": "http://127.0.0.1:2369",
|
||||||
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
|
||||||
"content-length": "506",
|
"content-length": "535",
|
||||||
"content-type": "application/json; charset=utf-8",
|
"content-type": "application/json; charset=utf-8",
|
||||||
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
|
||||||
"vary": "Origin, Accept-Encoding",
|
"vary": "Origin, Accept-Encoding",
|
||||||
|
@ -35,7 +35,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route
|
|||||||
*/
|
*/
|
||||||
describe('DB version integrity', function () {
|
describe('DB version integrity', function () {
|
||||||
// Only these variables should need updating
|
// Only these variables should need updating
|
||||||
const currentSchemaHash = '89e2e6356edb2a3cd1c7a9962ef1fc88';
|
const currentSchemaHash = 'c85378b0bbd7d5eeb1fff39796c30886';
|
||||||
const currentFixturesHash = '1d6562a1963a9b9d10d06070d537f11f';
|
const currentFixturesHash = '1d6562a1963a9b9d10d06070d537f11f';
|
||||||
const currentSettingsHash = '0b138cdd40e48b5b7dc4ebac2a7819a7';
|
const currentSettingsHash = '0b138cdd40e48b5b7dc4ebac2a7819a7';
|
||||||
const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
|
const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
|
||||||
|
Loading…
Reference in New Issue
Block a user