From 47c2f3c0d4e42c27c46ae7f7016900f60ea5c8eb Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 19 Dec 2017 17:06:11 +0100 Subject: [PATCH] Don't assume extra_preferences exists --- client/galaxy/scripts/mvc/tool/tool-form-composite.js | 5 ++++- client/galaxy/scripts/mvc/tool/tool-form.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js index 35207943334..878bebbbb48 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-composite.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-composite.js @@ -314,7 +314,10 @@ var View = Backbone.View.extend({ /** Render job caching option */ _renderUseCachedJob: function() { - var extra_user_preferences = JSON.parse(Galaxy.user.attributes.preferences.extra_user_preferences); + var extra_user_preferences = {}; + if (Galaxy.user.attributes.preferences && 'extra_user_preferences' in Galaxy.user.attributes.preferences){ + extra_user_preferences = JSON.parse(Galaxy.user.attributes.preferences.extra_user_preferences); + } var use_cached_job = 'use_cached_job|use_cached_job_checkbox' in extra_user_preferences ? extra_user_preferences['use_cached_job|use_cached_job_checkbox'] : false ; if (use_cached_job === 'true'){ this.job_options_form = new Form({ diff --git a/client/galaxy/scripts/mvc/tool/tool-form.js b/client/galaxy/scripts/mvc/tool/tool-form.js index ed42d5b2d7b..e0038c3c97c 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form.js +++ b/client/galaxy/scripts/mvc/tool/tool-form.js @@ -150,7 +150,10 @@ var View = Backbone.View.extend({ } // Job Re-use Options - var extra_user_preferences = JSON.parse(Galaxy.user.attributes.preferences.extra_user_preferences); + var extra_user_preferences = {}; + if (Galaxy.user.attributes.preferences && 'extra_user_preferences' in Galaxy.user.attributes.preferences) { + extra_user_preferences = JSON.parse(Galaxy.user.attributes.preferences.extra_user_preferences); + } var use_cached_job = 'use_cached_job|use_cached_job_checkbox' in extra_user_preferences ? extra_user_preferences['use_cached_job|use_cached_job_checkbox'] : false ; if (use_cached_job === 'true'){ options.inputs.push({