From 666c1250318f69780395e1ddddb169f24244969e Mon Sep 17 00:00:00 2001 From: birendra.kumar Date: Wed, 6 Apr 2022 13:14:20 +0530 Subject: [PATCH] update License Agreement and AIA bug fixes --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 3 ++- 400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html | 2 +- 400-SOURCECODE/Admin/src/assets/data/Menu.json | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index b4fe38b..d70c392 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1308,7 +1308,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $rootScope.haveRoleAdmin = true; } - if (result.UserTypeId == 8) { + // test and cuncurrent user not allow to admin + if (result.UserTypeId == 8 || result.UserTypeId == 6) { $rootScope.haveRoleAdmin = false; } diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html index 65abeb9..002502f 100644 --- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html +++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html @@ -151,7 +151,7 @@
- +
diff --git a/400-SOURCECODE/Admin/src/assets/data/Menu.json b/400-SOURCECODE/Admin/src/assets/data/Menu.json index 5584eda..744f4f2 100644 --- a/400-SOURCECODE/Admin/src/assets/data/Menu.json +++ b/400-SOURCECODE/Admin/src/assets/data/Menu.json @@ -29,7 +29,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "True" } @@ -242,7 +242,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "False" } @@ -455,7 +455,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "True" } @@ -670,7 +670,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "True" } @@ -883,7 +883,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "True" } @@ -1074,7 +1074,7 @@ { "HeaderMenuId": "100", "HeaderMenuName": "Profile", - "HeaderMenuStatus": "True", + "HeaderMenuStatus": "False", "SubMenu": [ { "SubMenuId": "200", @@ -1096,7 +1096,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "True" } @@ -1309,7 +1309,7 @@ }, { "SubMenuId": "203", - "SubMenuName": "Product License Agreement", + "SubMenuName": "License Info", "SubMenuUrl": "licenseAgreement", "SubMenuStatus": "True" } -- libgit2 0.21.4