diff --git a/framework/common/groovyScripts/SetTimeZoneFromBrowser.groovy b/framework/common/groovyScripts/SetTimeZoneFromBrowser.groovy index 9a0201a1d9..21f9607916 100644 --- a/framework/common/groovyScripts/SetTimeZoneFromBrowser.groovy +++ b/framework/common/groovyScripts/SetTimeZoneFromBrowser.groovy @@ -20,13 +20,14 @@ import org.apache.ofbiz.service.ServiceUtil public Map SetTimeZoneFromBrowser() { - Map results = ServiceUtil.returnSuccess() userLogin = from("UserLogin").where("userLoginId", parameters.userLogin.userLoginId).queryFirst(); if (userLogin) { if (!userLogin.lastTimeZone || "null".equals(userLogin.lastTimeZone)) { userLogin.lastTimeZone = parameters.localeName userLogin.store() + return ServiceUtil.returnSuccess() } + } else { + return ServiceUtil.returnError() } - return results } diff --git a/themes/common-theme/webapp/common/js/util/setUserTimeZone.js b/themes/common-theme/webapp/common/js/util/setUserTimeZone.js index 4c29928806..b74504bc47 100644 --- a/themes/common-theme/webapp/common/js/util/setUserTimeZone.js +++ b/themes/common-theme/webapp/common/js/util/setUserTimeZone.js @@ -17,18 +17,17 @@ specific language governing permissions and limitations under the License. */ -// Only once by session +// Only once by session (ref https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage) if (sessionStorage.getItem("SetTimeZoneFromBrowser") === null || sessionStorage.getItem("SetTimeZoneFromBrowser") !== "done") { - sessionStorage.setItem("SetTimeZoneFromBrowser", "done"); var timezone = moment.tz.guess(); $.ajax({ url: "SetTimeZoneFromBrowser", type: "POST", async: false, data: "localeName=" + timezone, - error: function(error) { - if (error != "") { - console.error("Error while setting user locale: ", error); + success: function(success) { + if (success._ERROR_MESSAGE_ === undefined && success._ERROR_MESSAGE_LIST_ === undefined) { + sessionStorage.setItem("SetTimeZoneFromBrowser", "done"); } } });