opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume extra_preferences exists

Browse Source
This commit is contained in:
mvdbeek
2017-12-31 18:06:50 +02:00
parent 58b8aa986b
commit 47c2f3c0d4
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/tool/tool-form-composite.js
+4 -1
View File
@@ -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({
client/galaxy/scripts/mvc/tool/tool-form.js
+4 -1
View File
@@ -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({