Commit 5066f710e34170690e0477785beca58a3ac5df6d
Merge branch 'solrefreshissue' into Develop
Showing
1 changed file
with
5 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -39,7 +39,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
39 | 39 | ethnicity: null, |
40 | 40 | modesty: null |
41 | 41 | }; |
42 | - | |
42 | + $rootScope.refreshcheck = null; | |
43 | 43 | $rootScope.isModestyOn; |
44 | 44 | $rootScope.isModestyOff; |
45 | 45 | $rootScope.SetSettingActiveTab; |
... | ... | @@ -252,6 +252,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
252 | 252 | $rootScope.isVisibleLogin = false; |
253 | 253 | $rootScope.userData = userInfo; |
254 | 254 | $rootScope.userModules = userInfo.modules; |
255 | + if ($rootScope.refreshcheck == null) { | |
256 | + $location.path('/'); | |
257 | + } | |
255 | 258 | } |
256 | 259 | } |
257 | 260 | catch (e) { |
... | ... | @@ -614,6 +617,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
614 | 617 | //jspanel functionality.. |
615 | 618 | |
616 | 619 | $rootScope.getModuleScrollPosition = function () { |
620 | + $rootScope.refreshcheck = "check"; | |
617 | 621 | $('.mCSB_container ul li').click(function () { |
618 | 622 | |
619 | 623 | $rootScope.scrollTopPosition = $(this).position().top; | ... | ... |