Commit d7c77eb13a25a7490cd920edd76b8c6f87ea1dbd

Authored by Nikita Kulshreshtha
1 parent ae3588a1

fixed bug 34241

admin is not visible fot test acc and testuser
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -363,8 +363,18 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A @@ -363,8 +363,18 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
363 $rootScope.userModules = result.Modules; 363 $rootScope.userModules = result.Modules;
364 364
365 //1. set haveRoleAdmin = false because LicenseInfo is not null 365 //1. set haveRoleAdmin = false because LicenseInfo is not null
366 - $rootScope.haveRoleAdmin = false; 366 + if (result.LicenseTypeId != 5) {
  367 +
  368 + $rootScope.haveRoleAdmin = true;
  369 +
  370 + }
  371 + if (result.UserTypeId == 8){
  372 +
  373 + $rootScope.haveRoleAdmin = false;
  374 + }
367 375
  376 + $("#modestyDiv").css("pointer-events", "none");
  377 + $("#modestyDiv").css("opacity", 0.5);
368 //2. 378 //2.
369 if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") { 379 if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
370 380
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 </ul> 51 </ul>
52 </li> 52 </li>
53 <!--redirecting to Admin--> 53 <!--redirecting to Admin-->
54 - <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" style="cursor: pointer;">Admin</a></liclass> 54 + <li class ="navbarItem"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li>
55 </ul> 55 </ul>
56 <ul class="nav navbar-nav navbar-right"> 56 <ul class="nav navbar-nav navbar-right">
57 <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> 57 <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -577,7 +577,7 @@ @@ -577,7 +577,7 @@
577 </div> 577 </div>
578 </div> 578 </div>
579 <div class=""> 579 <div class="">
580 - <div class="col-sm-6"> 580 + <div class="col-sm-6" id="modestyDiv" >
581 <h5 class="font13 bolder">Modesty Settings</h5> 581 <h5 class="font13 bolder">Modesty Settings</h5>
582 <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5"> 582 <img src="~/../content/images/common/adam-leaf.png" alt="" class="pull-left marginR5">
583 <div class="radio"> 583 <div class="radio">