diff options
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/constants.ts | 2 | ||||
-rw-r--r-- | server/initializers/database.ts | 4 | ||||
-rw-r--r-- | server/initializers/installer.ts | 4 |
3 files changed, 3 insertions, 7 deletions
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 | |||
29 | 29 | ||
30 | // Sortable columns per schema | 30 | // Sortable columns per schema |
31 | const SEARCHABLE_COLUMNS = { | 31 | const SEARCHABLE_COLUMNS = { |
32 | VIDEOS: [ 'name', 'magnetUri', 'host', 'author', 'tags' ] | 32 | VIDEOS: [ 'name', 'magnetUri', 'host', 'account', 'tags' ] |
33 | } | 33 | } |
34 | 34 | ||
35 | // Sortable columns per schema | 35 | // 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: { | |||
44 | OAuthClient?: OAuthClientModel, | 44 | OAuthClient?: OAuthClientModel, |
45 | OAuthToken?: OAuthTokenModel, | 45 | OAuthToken?: OAuthTokenModel, |
46 | Pod?: PodModel, | 46 | Pod?: PodModel, |
47 | RequestToPod?: RequestToPodModel, | ||
48 | RequestVideoEvent?: RequestVideoEventModel, | ||
49 | RequestVideoQadu?: RequestVideoQaduModel, | ||
50 | Request?: RequestModel, | ||
51 | Tag?: TagModel, | 47 | Tag?: TagModel, |
52 | AccountVideoRate?: AccountVideoRateModel, | 48 | AccountVideoRate?: AccountVideoRateModel, |
53 | AccountFollow?: AccountFollowModel, | 49 | 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' | |||
5 | import { CONFIG, LAST_MIGRATION_VERSION, CACHE } from './constants' | 5 | import { CONFIG, LAST_MIGRATION_VERSION, CACHE } from './constants' |
6 | import { clientsExist, usersExist } from './checker' | 6 | import { clientsExist, usersExist } from './checker' |
7 | import { logger, createCertsIfNotExist, mkdirpPromise, rimrafPromise } from '../helpers' | 7 | import { logger, createCertsIfNotExist, mkdirpPromise, rimrafPromise } from '../helpers' |
8 | import { createUserAuthorAndChannel } from '../lib' | 8 | import { createUserAccountAndChannel } from '../lib' |
9 | import { UserRole } from '../../shared' | 9 | import { UserRole } from '../../shared' |
10 | 10 | ||
11 | async function installApplication () { | 11 | async function installApplication () { |
@@ -117,7 +117,7 @@ async function createOAuthAdminIfNotExist () { | |||
117 | } | 117 | } |
118 | const user = db.User.build(userData) | 118 | const user = db.User.build(userData) |
119 | 119 | ||
120 | await createUserAuthorAndChannel(user, validatePassword) | 120 | await createUserAccountAndChannel(user, validatePassword) |
121 | logger.info('Username: ' + username) | 121 | logger.info('Username: ' + username) |
122 | logger.info('User password: ' + password) | 122 | logger.info('User password: ' + password) |
123 | 123 | ||