ADAM / AIAHTML5

Commit 8b51990d3bf849dca8f501c8799e3c272560e021

Authored by Utkarsh Singh
1 parent 6302a600

Committing updated files

Inline Side-by-side
Showing 3 changed files with 16 additions and 8 deletions
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @8b51990
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @8b51990
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @8b51990
... ... @@ -146,21 +146,29 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
146 146 $("#messageModal").modal('hide');
147 147 }
148 148  
149   - if ((!result.IsSubscriptionExpired) && (result.License.IsActive)) {
150   -
  149 + if ((!result.IsSubscriptionExpired) && (result.UserType == UserTypeConstants.SUPER_ADMIN)) {
151 150 $rootScope.userData = result;
152 151 $rootScope.userModules = result.Modules;
153 152 $rootScope.isVisibleLogin = false;
  153 + $rootScope.haveRoleAdmin = false;
  154 + localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
  155 + $('#dvUserModulesInfo').modal('show');
  156 + }
  157 + else if ((!result.IsSubscriptionExpired) && (result.License.IsActive)) {
154 158  
  159 + $rootScope.userData = result;
  160 + $rootScope.userModules = result.Modules;
  161 + $rootScope.isVisibleLogin = false;
  162 + $rootScope.haveRoleAdmin = true;
155 163 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
156 164 $('#dvUserModulesInfo').modal('show');
157 165  
158   - var userType = result.UserType + '';
  166 + //var userType = result.UserType + '';
159 167  
160   - if (userType === UserTypeConstants.SUPER_ADMIN)
161   - $rootScope.haveRoleAdmin = false;
162   - else
163   - $rootScope.haveRoleAdmin = true;
  168 + //if (userType === UserTypeConstants.SUPER_ADMIN)
  169 + // $rootScope.haveRoleAdmin = false;
  170 + //else
  171 + // $rootScope.haveRoleAdmin = true;
164 172 }
165 173 else if ((result.IsSubscriptionExpired) && (result.License.IsActive)) {
166 174 $rootScope.isVisibleLogin = true;
... ... @@ -170,7 +178,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
170 178 else if ((result.IsSubscriptionExpired) && !(result.License.IsActive)) {
171 179 $rootScope.isVisibleLogin = true;
172 180 $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDateString + '.';
173   - $rootScope.errorMessage = $rootScope.errorMessage + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
  181 + $rootScope.errorMessage = $rootScope.errorMessage + ' '+ LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
174 182 $("#messageModal").modal('show');
175 183 }
176 184 }
... ...