ADAM / AIAHTML5

Commit d1d121aec5345ab0e619e256e3288ce8ec657adb

Authored by Birendra Kumar
2 parents 8c023fbb 666c1250

Merge branch 'AIABugFixes' into AIA_Develop

Inline Side-by-side
Showing 3 changed files with 11 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @d1d121a
@@ -1308,7 +1308,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data @@ -1308,7 +1308,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1308 $rootScope.haveRoleAdmin = true; 1308 $rootScope.haveRoleAdmin = true;
1309 1309
1310 } 1310 }
1311 - if (result.UserTypeId == 8) { 1311 + // test and cuncurrent user not allow to admin
  1312 + if (result.UserTypeId == 8 || result.UserTypeId == 6) {
1312 1313
1313 $rootScope.haveRoleAdmin = false; 1314 $rootScope.haveRoleAdmin = false;
1314 } 1315 }
400-SOURCECODE/Admin/src/app/components/LicenseEntity/licenseAgreement.component.html
  View file @d1d121a
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 151
152 <div class="row"> 152 <div class="row">
153 <div class="col-sm-12 marginTop20 text-center"> 153 <div class="col-sm-12 marginTop20 text-center">
154 - <button class="btn btn-primary btn-sm" type="button" (click)="CloseLicense()"><i class="fa fa-plus-circle "></i> Cancel</button> 154 + <button class="btn btn-primary btn-sm" type="button" (click)="CloseLicense()"><i class="fa fa-close"></i> Cancel</button>
155 </div> 155 </div>
156 </div> 156 </div>
157 157
400-SOURCECODE/Admin/src/assets/data/Menu.json
  View file @d1d121a
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 }, 29 },
30 { 30 {
31 "SubMenuId": "203", 31 "SubMenuId": "203",
32 - "SubMenuName": "Product License Agreement", 32 + "SubMenuName": "License Info",
33 "SubMenuUrl": "licenseAgreement", 33 "SubMenuUrl": "licenseAgreement",
34 "SubMenuStatus": "True" 34 "SubMenuStatus": "True"
35 } 35 }
@@ -242,7 +242,7 @@ @@ -242,7 +242,7 @@
242 }, 242 },
243 { 243 {
244 "SubMenuId": "203", 244 "SubMenuId": "203",
245 - "SubMenuName": "Product License Agreement", 245 + "SubMenuName": "License Info",
246 "SubMenuUrl": "licenseAgreement", 246 "SubMenuUrl": "licenseAgreement",
247 "SubMenuStatus": "False" 247 "SubMenuStatus": "False"
248 } 248 }
@@ -455,7 +455,7 @@ @@ -455,7 +455,7 @@
455 }, 455 },
456 { 456 {
457 "SubMenuId": "203", 457 "SubMenuId": "203",
458 - "SubMenuName": "Product License Agreement", 458 + "SubMenuName": "License Info",
459 "SubMenuUrl": "licenseAgreement", 459 "SubMenuUrl": "licenseAgreement",
460 "SubMenuStatus": "True" 460 "SubMenuStatus": "True"
461 } 461 }
@@ -670,7 +670,7 @@ @@ -670,7 +670,7 @@
670 }, 670 },
671 { 671 {
672 "SubMenuId": "203", 672 "SubMenuId": "203",
673 - "SubMenuName": "Product License Agreement", 673 + "SubMenuName": "License Info",
674 "SubMenuUrl": "licenseAgreement", 674 "SubMenuUrl": "licenseAgreement",
675 "SubMenuStatus": "True" 675 "SubMenuStatus": "True"
676 } 676 }
@@ -883,7 +883,7 @@ @@ -883,7 +883,7 @@
883 }, 883 },
884 { 884 {
885 "SubMenuId": "203", 885 "SubMenuId": "203",
886 - "SubMenuName": "Product License Agreement", 886 + "SubMenuName": "License Info",
887 "SubMenuUrl": "licenseAgreement", 887 "SubMenuUrl": "licenseAgreement",
888 "SubMenuStatus": "True" 888 "SubMenuStatus": "True"
889 } 889 }
@@ -1074,7 +1074,7 @@ @@ -1074,7 +1074,7 @@
1074 { 1074 {
1075 "HeaderMenuId": "100", 1075 "HeaderMenuId": "100",
1076 "HeaderMenuName": "Profile", 1076 "HeaderMenuName": "Profile",
1077 - "HeaderMenuStatus": "True", 1077 + "HeaderMenuStatus": "False",
1078 "SubMenu": [ 1078 "SubMenu": [
1079 { 1079 {
1080 "SubMenuId": "200", 1080 "SubMenuId": "200",
@@ -1096,7 +1096,7 @@ @@ -1096,7 +1096,7 @@
1096 }, 1096 },
1097 { 1097 {
1098 "SubMenuId": "203", 1098 "SubMenuId": "203",
1099 - "SubMenuName": "Product License Agreement", 1099 + "SubMenuName": "License Info",
1100 "SubMenuUrl": "licenseAgreement", 1100 "SubMenuUrl": "licenseAgreement",
1101 "SubMenuStatus": "True" 1101 "SubMenuStatus": "True"
1102 } 1102 }
@@ -1309,7 +1309,7 @@ @@ -1309,7 +1309,7 @@
1309 }, 1309 },
1310 { 1310 {
1311 "SubMenuId": "203", 1311 "SubMenuId": "203",
1312 - "SubMenuName": "Product License Agreement", 1312 + "SubMenuName": "License Info",
1313 "SubMenuUrl": "licenseAgreement", 1313 "SubMenuUrl": "licenseAgreement",
1314 "SubMenuStatus": "True" 1314 "SubMenuStatus": "True"
1315 } 1315 }