Commit 4bdc9664b4bcb244a2e6d1e6d992dbdd08e04c65
1 parent
88c0b290
Manulally merged Bug#33895 into Develop
Showing
2 changed files
with
4 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -285,7 +285,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
285 | 285 | if (isCommingSoonModel == true) |
286 | 286 | { |
287 | 287 | |
288 | - ShowAssignedModulesPopup(result.Modules); | |
288 | + // ShowAssignedModulesPopup(result.Modules); | |
289 | 289 | |
290 | 290 | if (userInfo.rememberChk) { |
291 | 291 | |
... | ... | @@ -323,7 +323,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
323 | 323 | if (isCommingSoonModel == true) |
324 | 324 | { |
325 | 325 | |
326 | - ShowAssignedModulesPopup(result.Modules); | |
326 | + // ShowAssignedModulesPopup(result.Modules); | |
327 | 327 | } |
328 | 328 | |
329 | 329 | //4. |
... | ... | @@ -448,7 +448,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A |
448 | 448 | $rootScope.isVisibleLogin = false; |
449 | 449 | $rootScope.userData = userInfo; |
450 | 450 | $rootScope.userModules = userInfo.Modules; |
451 | - ShowAssignedModulesPopup(userInfo.Modules);; | |
451 | + // ShowAssignedModulesPopup(userInfo.Modules);; | |
452 | 452 | } |
453 | 453 | } |
454 | 454 | } | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
... | ... | @@ -26,7 +26,7 @@ |
26 | 26 | <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide "> |
27 | 27 | <!--{{name}}--> |
28 | 28 | <ul class="nav nav-sidebar" ng-init="hideScrollbar()"> |
29 | - <li ng-repeat="module in userModules" ng-disabled="module.id==7 || module.id==8 || module.id==13"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7 ||module.id==8 || module.id==13"><!--{{module.name}}--></a></li> | |
29 | + <li ng-repeat="module in userModules" ng-hide="module.id==8 || module.id==13"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-hide="module.id==8 || module.id==13"><!--{{module.name}}--></a></li> | |
30 | 30 | </ul> |
31 | 31 | </div> |
32 | 32 | ... | ... |