From 8ed2122eff99eebee1ecb289492d49b3e11cbc60 Mon Sep 17 00:00:00 2001 From: rob Date: Thu, 3 Nov 2022 18:48:49 -0400 Subject: [PATCH] more channel management cleanup --- app/controllers/admin/venue.js | 8 ++++++-- app/views/admin/venue/channel/editor.pug | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/venue.js b/app/controllers/admin/venue.js index 0595823..acf4521 100644 --- a/app/controllers/admin/venue.js +++ b/app/controllers/admin/venue.js @@ -62,8 +62,12 @@ class VenueAdminController extends SiteController { } async postUpdateChannel (req, res, next) { - const { venue: venueService } = this.dtp.services; + const { user: userService, venue: venueService } = this.dtp.services; try { + const owner = await userService.lookup(req.body.owner); + if (!owner) { + throw new SiteError(400, `Channel owner is empty or invalid: ${req.body.owner}`); + } await venueService.updateChannel(res.locals.channel, req.body); res.redirect('/admin/venue/channel'); } catch (error) { @@ -77,7 +81,7 @@ class VenueAdminController extends SiteController { try { const owner = await userService.lookup(req.body.owner); if (!owner) { - throw new SiteError(400, 'Channel owner is empty or invalid'); + throw new SiteError(400, `Channel owner is empty or invalid: ${req.body.owner}`); } await venueService.createChannel(owner, req.body); res.redirect('/admin/venue/channel'); diff --git a/app/views/admin/venue/channel/editor.pug b/app/views/admin/venue/channel/editor.pug index 80d63fa..a63964d 100644 --- a/app/views/admin/venue/channel/editor.pug +++ b/app/views/admin/venue/channel/editor.pug @@ -61,7 +61,7 @@ block content div(class="uk-width-1-1 uk-width-1-2@s") label(for="owner").uk-form-label Owner .uk-form-controls - input(type="text", name="owner", placeholder=`Enter channel owner's local username (here on ${site.name})`, value= channel ? channel.owner.username : user.username).uk-input + input(id="owner", type="text", name="owner", placeholder=`Enter channel owner's local username (here on ${site.name})`, value= channel ? channel.owner.username : user.username).uk-input div(class="uk-width-1-1 uk-width-1-2@s") label(for="sort-order").uk-form-label Sort order