diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js index b8dc40a0a669a292e8dcb81a3c035ed33e1d4fb8..8beaa46595e16bf310a09649072c629ed138d1ed 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js @@ -104,8 +104,11 @@ function ServerFacade(openbisServer) { this.openbisServer.ifRestoredSessionActive(callbackFunction); } - this.logout = function(callbackFunction) { - this.openbisServer.logout(callbackFunction); + this.logout = function() { + $("#mainContainer").hide(); + this.openbisServer.logout(function() { + location.reload(); + }); } // diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js index 94357efec884b3fbc4e3f5a5985cee06072c6083..bb9179142119b6f4b3a9a3558ba1d9284f606dc1 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js @@ -106,10 +106,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { var logoutButton = FormUtil.getButtonWithIcon("glyphicon-off", function() { $('body').addClass('bodyLogin'); - mainController.serverFacade.logout(function(data) { - $("#login-form-div").show(); - $("#mainContainer").hide(); - }); + mainController.serverFacade.logout(); }); var $searchForm = $("<form>", { "onsubmit": "return false;" }) diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js index 33f16328cbbca42291402834e0236846001ff729..74c870c9621ff3375bbb3817d4d63ead3cee369c 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/UserProfile/UserProfileController.js @@ -49,11 +49,13 @@ function UserProfileController(mainController, mode) { return; } var userId = this._mainController.serverFacade.getUserId(); - this._mainController.serverFacade.updateUserInformation(userId, userInformation, function(ok) { + this._mainController.serverFacade.updateUserInformation(userId, userInformation, (function(ok) { if (ok) { - mainController.changeView("showUserProfilePage"); + Util.showInfo("Profile saved. You will be logged out automatically in order to reload the profile data upon login.", (function() { + this._mainController.serverFacade.logout(); + }).bind(this)); } - }); + }).bind(this)); } this._validate = function(userInformation) {