diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll index 416589a..c317899 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb index 3a9a9bd..0c5cb96 100644 --- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb +++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index f6426df..fef077d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -146,21 +146,29 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $("#messageModal").modal('hide'); } - if ((!result.IsSubscriptionExpired) && (result.License.IsActive)) { - + if ((!result.IsSubscriptionExpired) && (result.UserType == UserTypeConstants.SUPER_ADMIN)) { $rootScope.userData = result; $rootScope.userModules = result.Modules; $rootScope.isVisibleLogin = false; + $rootScope.haveRoleAdmin = false; + localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); + $('#dvUserModulesInfo').modal('show'); + } + else if ((!result.IsSubscriptionExpired) && (result.License.IsActive)) { + $rootScope.userData = result; + $rootScope.userModules = result.Modules; + $rootScope.isVisibleLogin = false; + $rootScope.haveRoleAdmin = true; localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); $('#dvUserModulesInfo').modal('show'); - var userType = result.UserType + ''; + //var userType = result.UserType + ''; - if (userType === UserTypeConstants.SUPER_ADMIN) - $rootScope.haveRoleAdmin = false; - else - $rootScope.haveRoleAdmin = true; + //if (userType === UserTypeConstants.SUPER_ADMIN) + // $rootScope.haveRoleAdmin = false; + //else + // $rootScope.haveRoleAdmin = true; } else if ((result.IsSubscriptionExpired) && (result.License.IsActive)) { $rootScope.isVisibleLogin = true; @@ -170,7 +178,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic else if ((result.IsSubscriptionExpired) && !(result.License.IsActive)) { $rootScope.isVisibleLogin = true; $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDateString + '.'; - $rootScope.errorMessage = $rootScope.errorMessage + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE; + $rootScope.errorMessage = $rootScope.errorMessage + ' '+ LoginMessageConstants.LICENSE_INACTIVE_MESSAGE; $("#messageModal").modal('show'); } }