Merge branch 'AAToolBarDisable' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Amrita Vishnoi
2 parents dc1cfa04 b334d6e9
Showing 2 changed files with 2 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -3283,7 +3283,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#optionsListManagerTab").removeClass("active");
         console.log('close');
         $rootScope.disableAnnotationtoolOnListManager = false;
-        if ($rootScope.MenuModuleName == "DA") {
+        if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "AA") {
             $("#annotationpaintbrushsize").attr("href", "#canvasPaint");
             $("#annotationpainteraser").attr("href", "#canvasPaint");
             if ($rootScope.disableAnnotationtoolOnListManager == false) {
@@ -127,7 +127,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     //});
     $scope.isOpenBtnClicked = false;
     $scope.openModuleItemView = function (event) {
-       
+        $rootScope.MenuModuleName = "AA";
         localStorage.setItem("activeTab", $scope.activeTab);
         //0. Get selected Image Id
         if ($scope.isListViewButtonClicked == true) {