From 5a6c51219cd5c366f3c808ce798c324acbccaa5d Mon Sep 17 00:00:00 2001 From: Safihre Date: Sun, 24 Jan 2021 10:39:14 +0100 Subject: [PATCH] Only parse interface settings when they are set --- .../templates/static/javascripts/glitter.main.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/interfaces/Glitter/templates/static/javascripts/glitter.main.js b/interfaces/Glitter/templates/static/javascripts/glitter.main.js index f22954e..9bfdde7 100644 --- a/interfaces/Glitter/templates/static/javascripts/glitter.main.js +++ b/interfaces/Glitter/templates/static/javascripts/glitter.main.js @@ -1106,15 +1106,17 @@ function ViewModel() { self.queue.paginationLimit(response.config.misc.queue_limit.toString()) // Import the rest of the settings - var interfaceSettings = JSON.parse(response.config.misc.interface_settings); - self.dateFormat(interfaceSettings['dateFormat']); - self.extraQueueColumns(interfaceSettings['extraQueueColumns']); - self.extraHistoryColumns(interfaceSettings['extraHistoryColumns']); - self.displayCompact(interfaceSettings['displayCompact']); - self.displayFullWidth(interfaceSettings['displayFullWidth']); - self.displayTabbed(interfaceSettings['displayTabbed']); - self.confirmDeleteQueue(interfaceSettings['confirmDeleteQueue']); - self.confirmDeleteHistory(interfaceSettings['confirmDeleteHistory']); + if(response.config.misc.interface_settings) { + var interfaceSettings = JSON.parse(response.config.misc.interface_settings); + self.dateFormat(interfaceSettings['dateFormat']); + self.extraQueueColumns(interfaceSettings['extraQueueColumns']); + self.extraHistoryColumns(interfaceSettings['extraHistoryColumns']); + self.displayCompact(interfaceSettings['displayCompact']); + self.displayFullWidth(interfaceSettings['displayFullWidth']); + self.displayTabbed(interfaceSettings['displayTabbed']); + self.confirmDeleteQueue(interfaceSettings['confirmDeleteQueue']); + self.confirmDeleteHistory(interfaceSettings['confirmDeleteHistory']); + } } // Set bandwidth limit