diff --git a/lib/zin/wg/header/v1.php b/lib/zin/wg/header/v1.php index a27edd23e9..719d0482a5 100644 --- a/lib/zin/wg/header/v1.php +++ b/lib/zin/wg/header/v1.php @@ -107,7 +107,7 @@ class header extends wg $items[] = array ( 'active' => $currentVision == $vision, - 'url' => createLink('my', 'ajaxSwitchVision', "vision=$vision"), + 'url' => "javascript:selectVision(\"$vision\")", 'data-type' => 'ajax', 'text' => isset($lang->visionList[$vision]) ? $lang->visionList[$vision] : $vision, ); diff --git a/module/my/control.php b/module/my/control.php index e8e06baed8..08047a28f0 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -1627,6 +1627,6 @@ EOF; $_SESSION['user']->rights = $this->loadModel('user')->authorize($this->app->user->account); - echo js::locate($this->createLink('index', 'index'), 'parent'); + return $this->send(array('result' => 'success', 'load' => helper::createLink('index', 'index'))); } } diff --git a/www/js/zui3/zin.js b/www/js/zui3/zin.js index a170c74c65..e60ee3daf8 100644 --- a/www/js/zui3/zin.js +++ b/www/js/zui3/zin.js @@ -983,7 +983,19 @@ $.apps.changeAppsTheme(theme); } - $.extend(window, {registerRender: registerRender, fetchContent: fetchContent, loadTable: loadTable, loadPage: loadPage, postAndLoadPage: postAndLoadPage, loadCurrentPage: loadCurrentPage, parseSelector: parseSelector, toggleLoading: toggleLoading, openUrl: openUrl, openPage: openPage, goBack: goBack, registerTimer: registerTimer, loadModal: loadModal, loadTarget: loadTarget, loadComponent: loadComponent, loadPartial: loadPartial, reloadPage: reloadPage, selectLang: selectLang, selectTheme: selectTheme, changeAppLang, changeAppTheme: changeAppTheme, uploadFileByChunk: uploadFileByChunk}); + /** + * Select vision. + * @param {string} vision + */ + function selectVision(vision) + { + $.get($.createLink('my', 'ajaxSwitchVision', 'vision=' + vision), function() + { + window.top.location.href = $.createLink('index', 'index'); + }); + } + + $.extend(window, {registerRender: registerRender, fetchContent: fetchContent, loadTable: loadTable, loadPage: loadPage, postAndLoadPage: postAndLoadPage, loadCurrentPage: loadCurrentPage, parseSelector: parseSelector, toggleLoading: toggleLoading, openUrl: openUrl, openPage: openPage, goBack: goBack, registerTimer: registerTimer, loadModal: loadModal, loadTarget: loadTarget, loadComponent: loadComponent, loadPartial: loadPartial, reloadPage: reloadPage, selectLang: selectLang, selectTheme: selectTheme, selectVision: selectVision, changeAppLang, changeAppTheme: changeAppTheme, uploadFileByChunk: uploadFileByChunk}); $.extend($.apps, {openUrl: openUrl}); $.extend($, {ajaxSendScore: ajaxSendScore, selectLang: selectLang});