From da9692bdb173f766dfbacafcc2fdb3336b7e4b97 Mon Sep 17 00:00:00 2001 From: lllllllillllllillll Date: Mon, 17 Jun 2024 01:52:42 -0700 Subject: [PATCH] Added try block for images without RepoTags Issue #85 --- controllers/images.js | 8 +++++--- controllers/settings.js | 10 +++++++--- database/models.js | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/controllers/images.js b/controllers/images.js index f53b61a..fdbf18f 100644 --- a/controllers/images.js +++ b/controllers/images.js @@ -77,9 +77,11 @@ export const Images = async function(req, res) { size = size.toFixed(2); let status = ''; - if (container_images.includes(images[i].RepoTags[0])) { - status = 'In use'; - } + try { + if (container_images.includes(images[i].RepoTags[0])) { + status = 'In use'; + } + } catch {} let details = ` diff --git a/controllers/settings.js b/controllers/settings.js index 4bcc74d..ea3a3e5 100644 --- a/controllers/settings.js +++ b/controllers/settings.js @@ -11,7 +11,7 @@ export const Settings = (req, res) => { } -export const settingsAction = (req, res) => { +export const settingsAction = async (req, res) => { let action = req.params.action; let name = req.header('hx-trigger-name'); let value = req.header('hx-trigger'); @@ -21,9 +21,13 @@ export const settingsAction = (req, res) => { console.log(`value: ${value}`); if ((action == 'links') && (req.body.links == 'on')) { - console.log('links on'); + let exists = await ServerSettings.findOne({ where: {key: 'links'}}); + if (!exists) { const newSetting = await ServerSettings.create({ key: 'links', value: 'on'}); } + const setting = await ServerSettings.update({value: 'on'}, {where: {key: 'links'}}); } else if ((action == 'links') && (!req.body.links)) { - console.log('links off'); + let exists = await ServerSettings.findOne({ where: {key: 'links'}}); + if (!exists) { const newSetting = await ServerSettings.create({ key: 'links', value: 'off'}); } + const setting = await ServerSettings.update({value: 'off'}, {where: {key: 'links'}}); } diff --git a/database/models.js b/database/models.js index 0c3ac8a..a453b9e 100644 --- a/database/models.js +++ b/database/models.js @@ -226,7 +226,7 @@ export const Notification = sequelize.define('Notification', { }, }); -export const ServerSettings = sequelize.define('Settings', { +export const ServerSettings = sequelize.define('ServerSettings', { id: { type: DataTypes.INTEGER, autoIncrement: true, @@ -242,7 +242,7 @@ export const ServerSettings = sequelize.define('Settings', { } }); -export const UserSettings = sequelize.define('Settings', { +export const UserSettings = sequelize.define('UserSettings', { id: { type: DataTypes.INTEGER, autoIncrement: true,