Commit d1e4647931ea52f5b847a38209b73449c2c8b703
1 parent
2267dd55
changed code for getting modules.
Showing
3 changed files
with
12 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
| @@ -182,7 +182,9 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers | @@ -182,7 +182,9 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers | ||
| 182 | 182 | ||
| 183 | private static void GetModulesBasedOnUserType(User userInfo) | 183 | private static void GetModulesBasedOnUserType(User userInfo) |
| 184 | { | 184 | { |
| 185 | - if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN || userInfo.UserType == AIAHTML5.API.Models.User.GENERAL_ADMIN) | 185 | + //based on old .net code(AIA flex), we get modules based on licenseId if licenseid>0. |
| 186 | + //we verified in database that only superadmin has no licenseid so getting all modules for supeadmin | ||
| 187 | + if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN) | ||
| 186 | { | 188 | { |
| 187 | userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList(); | 189 | userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList(); |
| 188 | 190 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -220,7 +220,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -220,7 +220,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 220 | } | 220 | } |
| 221 | else { | 221 | else { |
| 222 | 222 | ||
| 223 | - if (result.UserType == UserTypeConstants.SUPER_ADMIN || result.UserType == UserTypeConstants.GENERAL_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && | 223 | + if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && |
| 224 | $rootScope.userData = result; | 224 | $rootScope.userData = result; |
| 225 | $rootScope.userModules = result.Modules; | 225 | $rootScope.userModules = result.Modules; |
| 226 | $rootScope.isVisibleLogin = false; | 226 | $rootScope.isVisibleLogin = false; |
| @@ -354,7 +354,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -354,7 +354,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 354 | 354 | ||
| 355 | if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) { | 355 | if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) { |
| 356 | 356 | ||
| 357 | - if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN || userInfo.UserType == UserTypeConstants.GENERAL_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && | 357 | + if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && |
| 358 | 358 | ||
| 359 | $rootScope.userData = userInfo; | 359 | $rootScope.userData = userInfo; |
| 360 | 360 |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
| @@ -1087,4 +1087,10 @@ color:#ffffff !important; | @@ -1087,4 +1087,10 @@ color:#ffffff !important; | ||
| 1087 | .jsPanel-btn-norm | 1087 | .jsPanel-btn-norm |
| 1088 | { | 1088 | { |
| 1089 | background-image: none !important; | 1089 | background-image: none !important; |
| 1090 | -} | ||
| 1091 | \ No newline at end of file | 1090 | \ No newline at end of file |
| 1091 | +} | ||
| 1092 | +.modal-small | ||
| 1093 | + { | ||
| 1094 | + | ||
| 1095 | + width : 400px !important; | ||
| 1096 | + | ||
| 1097 | + } | ||
| 1092 | \ No newline at end of file | 1098 | \ No newline at end of file |