From 10e25541009e56b04cf6a83319888ee8570c778e Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 3 Dec 2015 13:04:33 +0000 Subject: [PATCH] * All applications/ Tutorials: Fix discarding tutorials prompt not working if the configuration is set to sidebox --- home/js/app.js | 4 ++-- phpgwapi/js/jsapi/egw.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/js/app.js b/home/js/app.js index 8b011634e4..746c00963d 100644 --- a/home/js/app.js +++ b/home/js/app.js @@ -765,7 +765,7 @@ app.classes.home = AppJS.extend( /** * Function calls on discard checkbox and will set - * the egw_tutorial_autoload preference + * the egw_tutorial_noautoload preference * * @param {type} egw * @param {type} widget @@ -774,7 +774,7 @@ app.classes.home = AppJS.extend( { if (widget) { - this.egw.set_preference('common', 'egw_tutorial_autoload', widget.get_value()); + this.egw.set_preference('common', 'egw_tutorial_noautoload', widget.get_value()); } } }); diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js index db3940de26..12ea112822 100644 --- a/phpgwapi/js/jsapi/egw.js +++ b/phpgwapi/js/jsapi/egw.js @@ -326,7 +326,7 @@ if (window.framework === window.top.framework && typeof et2_dialog != 'undefined' && !egw.preference('egw_tutorial_noautoload', 'common') && !parseInt(document.getElementById('egw_script_id').getAttribute('data-framework-reload')) && - !egw.config('egw_tutorial_disable', 'phpgwapi') || egw.config('egw_tutorial_disable', 'phpgwapi') == 'sidebox') + (!egw.config('egw_tutorial_disable', 'phpgwapi') || egw.config('egw_tutorial_disable', 'phpgwapi') == 'sidebox')) { // we need to wait until common translations are loaded egw.langRequireApp(window, 'common', function()