diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-10-17 10:48:56 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-10-17 10:48:56 +0200 |
| commit | bb5d90e62f631af3c899fbe586485e64938a5927 (patch) | |
| tree | 8dc28c7027a52bed76bcc7e117da290ff7a58b6b /server/controllers | |
| parent | bcf21a376f1e26cb3e74236e4cc41909310d4c32 (diff) | |
| parent | a73115f31ae891cb47759f075b1d2cead40817a4 (diff) | |
| download | PeerTube-bb5d90e62f631af3c899fbe586485e64938a5927.tar.gz PeerTube-bb5d90e62f631af3c899fbe586485e64938a5927.tar.zst PeerTube-bb5d90e62f631af3c899fbe586485e64938a5927.zip | |
Merge branch 'feature/webtorrent-disabling' into develop
Diffstat (limited to 'server/controllers')
| -rw-r--r-- | server/controllers/api/users/me.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index ebe668110..82299747d 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts | |||
| @@ -328,6 +328,7 @@ async function updateMe (req: express.Request, res: express.Response, next: expr | |||
| 328 | if (body.password !== undefined) user.password = body.password | 328 | if (body.password !== undefined) user.password = body.password |
| 329 | if (body.email !== undefined) user.email = body.email | 329 | if (body.email !== undefined) user.email = body.email |
| 330 | if (body.nsfwPolicy !== undefined) user.nsfwPolicy = body.nsfwPolicy | 330 | if (body.nsfwPolicy !== undefined) user.nsfwPolicy = body.nsfwPolicy |
| 331 | if (body.webTorrentEnabled !== undefined) user.webTorrentEnabled = body.webTorrentEnabled | ||
| 331 | if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo | 332 | if (body.autoPlayVideo !== undefined) user.autoPlayVideo = body.autoPlayVideo |
| 332 | 333 | ||
| 333 | await sequelizeTypescript.transaction(async t => { | 334 | await sequelizeTypescript.transaction(async t => { |