Commit 88c0b2906ece2bb5238bab7896a5f89dac78713c
1 parent
5043c84f
removed comments
Showing
1 changed file
with
2 additions
and
58 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -507,65 +507,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
| 507 | 507 | userInfo["username"] = userInfo.LoginId; |
| 508 | 508 | userInfo["password"] = userInfo.Password; |
| 509 | 509 | |
| 510 | - //2. | |
| 510 | + | |
| 511 | 511 | $rootScope.AuthenticateUser(userInfo); |
| 512 | - // if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) { | |
| 513 | - | |
| 514 | - ////0 | |
| 515 | - //$rootScope.userData = userInfo; | |
| 516 | - //$rootScope.userModules = userInfo.Modules; | |
| 517 | - | |
| 518 | - //1. | |
| 519 | - //userInfo["username"] = userInfo.LoginId; | |
| 520 | - //userInfo["password"] = userInfo.Password; | |
| 521 | - | |
| 522 | - //2. | |
| 523 | - // $rootScope.AuthenticateUser(userInfo); | |
| 524 | - | |
| 525 | - // $rootScope.haveRoleAdmin = true; | |
| 526 | - | |
| 527 | - // if ($rootScope.refreshcheck == null) { | |
| 528 | - | |
| 529 | - // if ($location.path() == "/lab-exercises-detail") { | |
| 530 | - | |
| 531 | - // $location.url('/'); | |
| 532 | - // } | |
| 533 | - // else { | |
| 534 | - | |
| 535 | - // $location.path('/'); | |
| 536 | - // } | |
| 537 | - // $rootScope.isVisibleLogin = false; | |
| 538 | - // } | |
| 539 | - | |
| 540 | - // } | |
| 541 | - | |
| 542 | - //else | |
| 543 | - //{ | |
| 544 | - // $rootScope.haveRoleAdmin = false; | |
| 545 | - | |
| 546 | - // if (userInfo.LicenseInfo.IsTermAccepted) | |
| 547 | - // { | |
| 548 | - // $rootScope.userData = userInfo; | |
| 549 | - // $rootScope.userModules = userInfo.Modules; | |
| 550 | - // $rootScope.isVisibleLogin = false; | |
| 551 | - | |
| 552 | - | |
| 553 | - // if ($rootScope.refreshcheck == null) { | |
| 554 | - // $location.path('/'); | |
| 555 | - // } | |
| 556 | - | |
| 557 | - // } | |
| 558 | - // else { | |
| 559 | - // if ($('#dvTerms').length > 0) { | |
| 560 | - // $('#dvTerms').html(userInfo.TermsAndConditionsText); | |
| 561 | - // } | |
| 562 | - // $rootScope.isVisibleLogin = true; | |
| 563 | - // $('#dvTermCondition').fadeIn(); | |
| 564 | - // $rootScope.userData = userInfo; | |
| 565 | - // $rootScope.userModules = userInfo.Modules; | |
| 566 | - // //$rootScope.haveRoleAdmin = true; | |
| 567 | - // $location.path('/'); | |
| 568 | - // } | |
| 512 | + | |
| 569 | 513 | if ($rootScope.refreshcheck == null) { |
| 570 | 514 | |
| 571 | 515 | if ($location.path() == "/lab-exercises-detail") { | ... | ... |