From 38fa2065831b5f55be0d7f30f19a62c967397208 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Nov 2017 14:48:08 +0100 Subject: Remove references to author --- server/initializers/constants.ts | 2 +- server/initializers/database.ts | 4 ---- server/initializers/installer.ts | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index e1f877e80..e6fda88c2 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -29,7 +29,7 @@ const PAGINATION_COUNT_DEFAULT = 15 // Sortable columns per schema const SEARCHABLE_COLUMNS = { - VIDEOS: [ 'name', 'magnetUri', 'host', 'author', 'tags' ] + VIDEOS: [ 'name', 'magnetUri', 'host', 'account', 'tags' ] } // Sortable columns per schema diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 52e766394..aefb6da3a 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -44,10 +44,6 @@ const database: { OAuthClient?: OAuthClientModel, OAuthToken?: OAuthTokenModel, Pod?: PodModel, - RequestToPod?: RequestToPodModel, - RequestVideoEvent?: RequestVideoEventModel, - RequestVideoQadu?: RequestVideoQaduModel, - Request?: RequestModel, Tag?: TagModel, AccountVideoRate?: AccountVideoRateModel, AccountFollow?: AccountFollowModel, diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index 077472341..c8f6b3bc2 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -5,7 +5,7 @@ import { database as db } from './database' import { CONFIG, LAST_MIGRATION_VERSION, CACHE } from './constants' import { clientsExist, usersExist } from './checker' import { logger, createCertsIfNotExist, mkdirpPromise, rimrafPromise } from '../helpers' -import { createUserAuthorAndChannel } from '../lib' +import { createUserAccountAndChannel } from '../lib' import { UserRole } from '../../shared' async function installApplication () { @@ -117,7 +117,7 @@ async function createOAuthAdminIfNotExist () { } const user = db.User.build(userData) - await createUserAuthorAndChannel(user, validatePassword) + await createUserAccountAndChannel(user, validatePassword) logger.info('Username: ' + username) logger.info('User password: ' + password) -- cgit v1.2.3