svn commit: r1851886 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ themes/common-theme/webapp/common/js/util/OfbizUtil.js

Author: jleroux
Date: Wed Jan 23 07:16:54 2019
New Revision: 1851886

URL: http://svn.apache.org/viewvc?rev=1851886&view=rev
Log:
"Applied fix from trunk for revision: 1851885 "
------------------------------------------------------------------------
r1851885 | jleroux | 2019-01-23 08:14:21 +0100 (mer. 23 janv. 2019) | 10 lignes

Fixed: Implemented: Navigate from a domain to another with automated signed in
authentication
(OFBIZ-10307)

Non functional change

Removes now useless "webappName" var after I put in the SecuredUserLoginId
cookies.

Thanks: Michael for spotting it in OFBIZ-10814
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/OfbizUtil.js

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 23 07:16:54 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885

Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/OfbizUtil.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/OfbizUtil.js?rev=1851886&r1=1851885&r2=1851886&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/OfbizUtil.js (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/OfbizUtil.js Wed Jan 23 07:16:54 2019
@@ -1323,7 +1323,7 @@ function submitPagination(obj, url) {
         }
     }
 }
-function loadJWT(webAppName) {
+function loadJWT() {
     var JwtToken = "";
     jQuery.ajax({
         url: "loadJWT",
@@ -1340,9 +1340,9 @@ function loadJWT(webAppName) {
     return JwtToken;
 }
 
-function sendJWT(webAppName, targetUrl) {
+function sendJWT(targetUrl) {
     var redirectUrl = targetUrl;
-    var jwtToken = loadJWT(webAppName);
+    var jwtToken = loadJWT();
     if (jwtToken != null && jwtToken != "") {
         jQuery.ajax({
             url: targetUrl,