diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index d88e597..1f8bbe2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -507,65 +507,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A userInfo["username"] = userInfo.LoginId; userInfo["password"] = userInfo.Password; - //2. + $rootScope.AuthenticateUser(userInfo); - // if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) { - - ////0 - //$rootScope.userData = userInfo; - //$rootScope.userModules = userInfo.Modules; - - //1. - //userInfo["username"] = userInfo.LoginId; - //userInfo["password"] = userInfo.Password; - - //2. - // $rootScope.AuthenticateUser(userInfo); - - // $rootScope.haveRoleAdmin = true; - - // if ($rootScope.refreshcheck == null) { - - // if ($location.path() == "/lab-exercises-detail") { - - // $location.url('/'); - // } - // else { - - // $location.path('/'); - // } - // $rootScope.isVisibleLogin = false; - // } - - // } - - //else - //{ - // $rootScope.haveRoleAdmin = false; - - // if (userInfo.LicenseInfo.IsTermAccepted) - // { - // $rootScope.userData = userInfo; - // $rootScope.userModules = userInfo.Modules; - // $rootScope.isVisibleLogin = false; - - - // if ($rootScope.refreshcheck == null) { - // $location.path('/'); - // } - - // } - // else { - // if ($('#dvTerms').length > 0) { - // $('#dvTerms').html(userInfo.TermsAndConditionsText); - // } - // $rootScope.isVisibleLogin = true; - // $('#dvTermCondition').fadeIn(); - // $rootScope.userData = userInfo; - // $rootScope.userModules = userInfo.Modules; - // //$rootScope.haveRoleAdmin = true; - // $location.path('/'); - // } + if ($rootScope.refreshcheck == null) { if ($location.path() == "/lab-exercises-detail") {