Commit c8d79b2a98c6d74dcd7e1172b2420a1554e0b30e
1 parent
1abf0b78
fix bug in CA direct link
Showing
1 changed file
with
7 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -606,7 +606,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -606,7 +606,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
606 | } | 606 | } |
607 | 607 | ||
608 | $scope.helpTopicLink = function () { | 608 | $scope.helpTopicLink = function () { |
609 | - $rootScope.homeURL = $location.absUrl(); | 609 | + var x = $location.absUrl(); |
610 | + var pos = x.lastIndexOf($location.url()); | ||
611 | + | ||
612 | + $rootScope.homeURL =x.substring(0,pos+1); | ||
613 | + | ||
610 | var hTopicUrl = $rootScope.homeURL + "content/help/index.html"; | 614 | var hTopicUrl = $rootScope.homeURL + "content/help/index.html"; |
611 | var aboutADAM = $rootScope.homeURL + "content/help/about/Adam_Credits_AIA5.html"; | 615 | var aboutADAM = $rootScope.homeURL + "content/help/about/Adam_Credits_AIA5.html"; |
612 | 616 | ||
@@ -1102,7 +1106,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -1102,7 +1106,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
1102 | $rootScope.siteUrlInfo.userId = paramInfo[1]; | 1106 | $rootScope.siteUrlInfo.userId = paramInfo[1]; |
1103 | console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.userId); | 1107 | console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.userId); |
1104 | } | 1108 | } |
1105 | - else if (paramInfo[0].toLowerCase() == 'account') { | 1109 | + else if (paramInfo[0].toLowerCase() == 'accountnumber') { |
1106 | 1110 | ||
1107 | $rootScope.siteUrlInfo.accountNumber = paramInfo[1]; | 1111 | $rootScope.siteUrlInfo.accountNumber = paramInfo[1]; |
1108 | console.log("$rootScope.siteUrlInfo.accountNumber" + $rootScope.siteUrlInfo.accountNumber); | 1112 | console.log("$rootScope.siteUrlInfo.accountNumber" + $rootScope.siteUrlInfo.accountNumber); |
@@ -1542,7 +1546,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -1542,7 +1546,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
1542 | } | 1546 | } |
1543 | else { | 1547 | else { |
1544 | 1548 | ||
1545 | - $location.path('/'); | 1549 | + $location.url('/'); |
1546 | } | 1550 | } |
1547 | $rootScope.isVisibleLogin = false; | 1551 | $rootScope.isVisibleLogin = false; |
1548 | } | 1552 | } |